make-wrapper should use runtimeShell, not bash, for cross-compilation

wip/yesman
Travis Athougies 6 years ago
parent 1de9c8a023
commit 9531a32b60
  1. 2
      pkgs/build-support/setup-hooks/make-wrapper.sh
  2. 2
      pkgs/top-level/all-packages.nix

@ -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

@ -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 }:

Loading…
Cancel
Save