From 30e9aa5357d2e220a8a5b57d5617a0426443cd5e Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 4 May 2024 11:31:33 -0500 Subject: [PATCH] nix: make android emulator optional Tony was having issues on aarch64-linux Changelog-Fixed: Fix nix build on aarch64-linux --- shell.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 22654601..129e1da7 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,8 @@ { pkgs ? import { } , 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}";