androidenv/emulate-app: use runtimeShell instead of stdenv.shell
See also https://github.com/NixOS/nixpkgs PR 56408.
This commit is contained in:
parent
b3909d1cb1
commit
7802608649
|
@ -15,7 +15,7 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
emulateApp = import ./emulate-app.nix {
|
emulateApp = import ./emulate-app.nix {
|
||||||
inherit (pkgs) stdenv lib;
|
inherit (pkgs) stdenv lib runtimeShell;
|
||||||
inherit composeAndroidPackages;
|
inherit composeAndroidPackages;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ composeAndroidPackages, stdenv, lib }:
|
{ composeAndroidPackages, stdenv, lib, runtimeShell }:
|
||||||
{ name, app ? null
|
{ name, app ? null
|
||||||
, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default"
|
, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default"
|
||||||
, enableGPU ? false, extraAVDFiles ? []
|
, enableGPU ? false, extraAVDFiles ? []
|
||||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
|
||||||
cat > $out/bin/run-test-emulator << "EOF"
|
cat > $out/bin/run-test-emulator << "EOF"
|
||||||
#! ${stdenv.shell} -e
|
#!${runtimeShell} -e
|
||||||
|
|
||||||
# We need a TMPDIR
|
# We need a TMPDIR
|
||||||
if [ "$TMPDIR" = "" ]
|
if [ "$TMPDIR" = "" ]
|
||||||
|
|
Loading…
Reference in a new issue