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

Merge pull request #50244 from tathougies/travis/wrap-correctly

Browse Source 
make-wrapper should use runtimeShell, not $SHELL, for cross-compilation
This commit is contained in:
Matthew Bauer 2018-11-13 13:55:26 -06:00 committed by GitHub
commit f9a6963d9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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")" mkdir -p "$(dirname "$wrapper")"
echo "#! $SHELL -e" > "$wrapper" echo "#! @shell@ -e" > "$wrapper"
params=("$@") params=("$@")
for ((n = 2; n < ${#params[*]}; n += 1)); do for ((n = 2; n < ${#params[*]}; n += 1)); do

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

@ -344,7 +344,7 @@ with pkgs;
inherit contents compressor prepend; inherit contents compressor prepend;
}; };
makeWrapper = makeSetupHook { deps = [ dieHook ]; } makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; }
../build-support/setup-hooks/make-wrapper.sh; ../build-support/setup-hooks/make-wrapper.sh;
makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: