nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

androidenv/emulate-app: use runtimeShell instead of stdenv.shell

Browse Source 
See also https://github.com/NixOS/nixpkgs PR 56408.
This commit is contained in:
Luca Favatella 2020-03-08 10:51:05 +00:00 committed by Alyssa Ross
parent b3909d1cb1
commit 7802608649
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/mobile/androidenv/default.nix
View File

@ -15,7 +15,7 @@ rec {
};
emulateApp = import ./emulate-app.nix {
inherit (pkgs) stdenv lib;
inherit (pkgs) stdenv lib runtimeShell;
inherit composeAndroidPackages;
};

4
pkgs/development/mobile/androidenv/emulate-app.nix
View File

@ -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" = "" ]