colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Travis Athougies 2018-11-11 09:55:55 -08:00
parent 1de9c8a023
commit 9531a32b60
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

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

2
pkgs/top-level/all-packages.nix
View File

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