diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-04-19 14:57:25 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-04-19 14:57:25 +0200 |
| commit | 0ca211d4ec600fa7b3cc701e4997cd1e8d38ebdc (patch) | |
| tree | 4f9b09ca5d55e44710f020bcf6621daa4fd6b73a /nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix | |
| parent | 1c2ef52230ed2c8b2529c47ce6a857bdde46c7c7 (diff) | |
| parent | b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb (diff) | |
Merge commit 'b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix index fa9a56fadba..6273d75cc38 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix @@ -8,6 +8,7 @@ let sdkArgs = { + toolsVersion = "26.1.1"; platformVersions = [ platformVersion ]; includeEmulator = true; includeSystemImages = true; @@ -67,12 +68,12 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device for testing if it does not exists - ${sdk}/libexec/android-sdk/tools/android list targets + ${sdk}/libexec/android-sdk/tools/bin/avdmanager list target if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${sdk}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS + yes "" | ${sdk}/libexec/android-sdk/tools/bin/avdmanager create avd -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" $NIX_ANDROID_AVD_FLAGS ${lib.optionalString enableGPU '' # Enable GPU acceleration |