diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-14 19:41:50 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-11-14 23:37:31 +0100 |
| commit | c9223a17bc86fda888b36b7fde9ebc5bed3f0463 (patch) | |
| tree | 365fc15319d53f8c63f7bf6b03b61014d1cc0275 /pkgs/stdenv | |
| parent | 25fafd2eb5599c6d61357964f9802c260c81556a (diff) | |
| download | nixlib-c9223a17bc86fda888b36b7fde9ebc5bed3f0463.tar nixlib-c9223a17bc86fda888b36b7fde9ebc5bed3f0463.tar.gz nixlib-c9223a17bc86fda888b36b7fde9ebc5bed3f0463.tar.bz2 nixlib-c9223a17bc86fda888b36b7fde9ebc5bed3f0463.tar.lz nixlib-c9223a17bc86fda888b36b7fde9ebc5bed3f0463.tar.xz nixlib-c9223a17bc86fda888b36b7fde9ebc5bed3f0463.tar.zst nixlib-c9223a17bc86fda888b36b7fde9ebc5bed3f0463.zip | |
Revert "patch-shebangs: use --build for auto patch shebangs"
Completely breaks darwin. Every package in the stdenv that has shebangs in the output will end up with references to bootstrap-tools. This reverts commit eb7c50a993833ecdb94cc3affb55ac4c560edf50.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 336e229c6a32..be96d018612c 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -257,9 +257,17 @@ shopt -s nullglob # Set up the initial path. PATH= +HOST_PATH= for i in $initialPath; do if [ "$i" = / ]; then i=; fi addToSearchPath PATH "$i/bin" + + # For backward compatibility, we add initial path to HOST_PATH so + # it can be used in auto patch-shebangs. Unfortunately this will + # not work with cross compilation. + if [ -z "${strictDeps-}" ]; then + addToSearchPath HOST_PATH "$i/bin" + fi done if (( "${NIX_DEBUG:-0}" >= 1 )); then |