diff options
| author | Luca Favatella <lucafavatella@users.noreply.github.com> | 2020-03-08 10:51:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-16 10:27:37 +0000 |
| commit | 7802608649e3d392f3fa8d58b21bd4b8221f9ab6 (patch) | |
| tree | ed1b373ff406ec65f174b4d0f48f2018b72b32e8 /pkgs/development/mobile | |
| parent | b3909d1cb1d6d881372c0a4622dcaada21b8b1c8 (diff) | |
androidenv/emulate-app: use runtimeShell instead of stdenv.shell
See also https://github.com/NixOS/nixpkgs PR 56408.
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/emulate-app.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 14882bc22438..0228cd839242 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -15,7 +15,7 @@ rec { }; emulateApp = import ./emulate-app.nix { - inherit (pkgs) stdenv lib; + inherit (pkgs) stdenv lib runtimeShell; inherit composeAndroidPackages; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 6273d75cc380..83be06a31419 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,4 +1,4 @@ -{ composeAndroidPackages, stdenv, lib }: +{ composeAndroidPackages, stdenv, lib, runtimeShell }: { name, app ? null , platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default" , enableGPU ? false, extraAVDFiles ? [] @@ -25,7 +25,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/run-test-emulator << "EOF" - #! ${stdenv.shell} -e + #!${runtimeShell} -e # We need a TMPDIR if [ "$TMPDIR" = "" ] |