Skip to content

Commit

Permalink
nix: make android emulator optional
Browse files Browse the repository at this point in the history
Tony was having issues on aarch64-linux

Changelog-Fixed: Fix nix build on aarch64-linux
  • Loading branch information
jb55 committed May 4, 2024
1 parent aacc41e commit 30e9aa5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}";
Expand Down

0 comments on commit 30e9aa5

Please sign in to comment.