tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: make android emulator optional

Browse Source 
Tony was having issues on aarch64-linux

Changelog-Fixed: Fix nix build on aarch64-linux
This commit is contained in:
William Casarin
2024-05-04 11:31:33 -05:00
parent aacc41e4c2
commit 30e9aa5357
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell.nix
View File

@@ -1,6 +1,8 @@
{ pkgs ? import <nixpkgs> { } { pkgs ? import <nixpkgs> { }
, android ? fetchTarball "https://github.com/tadfisher/android-nixpkgs/archive/refs/tags/2024-04-02.tar.gz" , android ? fetchTarball "https://github.com/tadfisher/android-nixpkgs/archive/refs/tags/2024-04-02.tar.gz"
, use_android ? true }: , use_android ? true
, android_emulator ? false
}:
with pkgs; with pkgs;
let let
@@ -13,9 +15,8 @@ let
build-tools-34-0-0 build-tools-34-0-0
platform-tools platform-tools
platforms-android-30 platforms-android-30
emulator
ndk-24-0-8215888 ndk-24-0-8215888
]); ] ++ lib.optional android_emulator [emulator]);
android-sdk-path = "${android-sdk.out}/share/android-sdk"; android-sdk-path = "${android-sdk.out}/share/android-sdk";
android-ndk-path = "${android-sdk-path}/ndk/${ndk-version}"; android-ndk-path = "${android-sdk-path}/ndk/${ndk-version}";