git.iko.soy/typeable/nixpkgs
on master help sign in
androidenv/emulate-app: use runtimeShell instead of stdenv.shell

See also https://github.com/NixOS/nixpkgs PR 56408.

commit7802608649e3d392f3fa8d58b21bd4b8221f9ab6 authorLuca Favatella <lucafavatella@users.noreply.github.com> dateSun 8 Mar 2020, 10:51 (7 years ago) parentb3909d1
2 files changed+3−3
pkgs/development/mobile/androidenv/default.nix+1−1 pkgs/development/mobile/androidenv/emulate-app.nix+2−2
pkgs/development/mobile/androidenv/default.nix+1−1
@@ -15,7 +15,7 @@ rec {
1515 };
1616
1717 emulateApp = import ./emulate-app.nix {
18− inherit (pkgs) stdenv lib;
18+ inherit (pkgs) stdenv lib runtimeShell;
1919 inherit composeAndroidPackages;
2020 };
2121
pkgs/development/mobile/androidenv/emulate-app.nix+2−2
@@ -1,4 +1,4 @@
1−{ composeAndroidPackages, stdenv, lib }:
1+{ composeAndroidPackages, stdenv, lib, runtimeShell }:
22{ name, app ? null
33, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default"
44, enableGPU ? false, extraAVDFiles ? []
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
2525 mkdir -p $out/bin
2626
2727 cat > $out/bin/run-test-emulator << "EOF"
28− #! ${stdenv.shell} -e
28+ #!${runtimeShell} -e
2929
3030 # We need a TMPDIR
3131 if [ "$TMPDIR" = "" ]