about summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-10-31 15:34:45 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-11-02 00:27:14 -0500
commiteb7c50a993833ecdb94cc3affb55ac4c560edf50 (patch)
treeab4af2fc257cbbabfa81100474a403c5da3004e2 /pkgs/stdenv
parentbde99096a80e74692795fa2782619c46a476839e (diff)
downloadnixlib-eb7c50a993833ecdb94cc3affb55ac4c560edf50.tar
nixlib-eb7c50a993833ecdb94cc3affb55ac4c560edf50.tar.gz
nixlib-eb7c50a993833ecdb94cc3affb55ac4c560edf50.tar.bz2
nixlib-eb7c50a993833ecdb94cc3affb55ac4c560edf50.tar.lz
nixlib-eb7c50a993833ecdb94cc3affb55ac4c560edf50.tar.xz
nixlib-eb7c50a993833ecdb94cc3affb55ac4c560edf50.tar.zst
nixlib-eb7c50a993833ecdb94cc3affb55ac4c560edf50.zip
patch-shebangs: use --build for auto patch shebangs
In strictDeps=false, autoPatchshebangs should use
--build (corresponding to PATH) to lookup commands. This restores the
previous behavior of patchshebangs so that we don’t break stuff that
isn’t careful in the buildInputs vs. nativeBuildInputs distinction.
Unfortunately this won’t work under cross compilation.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/setup.sh8
1 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 8af369b1d17d..81c1725f1d19 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -257,17 +257,9 @@ 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