diff options
| author | Travis Athougies <travis@athougies.net> | 2018-11-11 09:55:55 -0800 |
|---|---|---|
| committer | Travis Athougies <travis@athougies.net> | 2018-11-11 10:25:05 -0800 |
| commit | 9531a32b6074fe25728b7466831e9007870ac1eb (patch) | |
| tree | 5ad2a0561250efcba67f9940b096ea2b21a33455 | |
| parent | 1de9c8a023a4000e250e07f18d42b900c6db6cf8 (diff) | |
| download | nixpkgs-9531a32b6074fe25728b7466831e9007870ac1eb.tar nixpkgs-9531a32b6074fe25728b7466831e9007870ac1eb.tar.gz nixpkgs-9531a32b6074fe25728b7466831e9007870ac1eb.tar.bz2 nixpkgs-9531a32b6074fe25728b7466831e9007870ac1eb.tar.lz nixpkgs-9531a32b6074fe25728b7466831e9007870ac1eb.tar.xz nixpkgs-9531a32b6074fe25728b7466831e9007870ac1eb.tar.zst nixpkgs-9531a32b6074fe25728b7466831e9007870ac1eb.zip | |
make-wrapper should use runtimeShell, not bash, for cross-compilation
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-wrapper.sh | 2 | ||||
| -rw-r--r-- | 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 }: |