notedeck

commit 30e9aa5357d2e220a8a5b57d5617a0426443cd5e
parent aacc41e4c2c6c7f467c92b8bb6d5858e41dfa18e
Author: William Casarin <jb55@jb55.com>
Date:   Sat,  4 May 2024 11:31:33 -0500

nix: make android emulator optional

Tony was having issues on aarch64-linux

Changelog-Fixed: Fix nix build on aarch64-linux

Diffstat:
M
shell.nix
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/shell.nix b/shell.nix
@@ -1,6 +1,8 @@
 { pkgs ? import <nixpkgs> { }
 , 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;
 
 let
@@ -13,9 +15,8 @@ let
     build-tools-34-0-0
     platform-tools
     platforms-android-30
-    emulator
     ndk-24-0-8215888
-  ]);
+  ] ++ lib.optional android_emulator [emulator]);
 
   android-sdk-path = "${android-sdk.out}/share/android-sdk";
   android-ndk-path = "${android-sdk-path}/ndk/${ndk-version}";