From 9531a32b6074fe25728b7466831e9007870ac1eb Mon Sep 17 00:00:00 2001
From: Travis Athougies <travis@athougies.net>
Date: Sun, 11 Nov 2018 09:55:55 -0800
Subject: [PATCH] make-wrapper should use runtimeShell, not bash, for
 cross-compilation

---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 2 +-
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 5d5ddcaa8d7..bc12be0fa36 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -40,7 +40,7 @@ makeWrapper() {
 
     mkdir -p "$(dirname "$wrapper")"
 
-    echo "#! $SHELL -e" > "$wrapper"
+    echo "#! @shell@ -e" > "$wrapper"
 
     params=("$@")
     for ((n = 2; n < ${#params[*]}; n += 1)); do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfddbd965d1..1491d62c5a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -356,7 +356,7 @@ with pkgs;
       inherit contents compressor prepend;
     };
 
-  makeWrapper = makeSetupHook { deps = [ dieHook ]; }
+  makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; }
                               ../build-support/setup-hooks/make-wrapper.sh;
 
   makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: