From 7802608649e3d392f3fa8d58b21bd4b8221f9ab6 Mon Sep 17 00:00:00 2001
From: Luca Favatella <lucafavatella@users.noreply.github.com>
Date: Sun, 8 Mar 2020 10:51:05 +0000
Subject: androidenv/emulate-app: use runtimeShell instead of stdenv.shell

See also https://github.com/NixOS/nixpkgs PR 56408.
---
 pkgs/development/mobile/androidenv/default.nix     | 2 +-
 pkgs/development/mobile/androidenv/emulate-app.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development/mobile')

diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 14882bc2243..0228cd83924 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 6273d75cc38..83be06a3141 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" = "" ]
-- 
cgit 1.4.1