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 eb7c50a993
.
This commit is contained in:
parent
25fafd2eb5
commit
c9223a17bc
@ -102,12 +102,10 @@ patchShebangs() {
|
||||
patchShebangsAuto () {
|
||||
if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
|
||||
|
||||
if [ -z "${strictDeps-}"]; then
|
||||
patchShebangs --build "$prefix"
|
||||
# Dev output will end up being run on the build platform. An
|
||||
# example case of this is sdl2-config. Otherwise, we can just
|
||||
# use the runtime path (--host).
|
||||
elif [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
|
||||
if [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
|
||||
patchShebangs --build "$prefix"
|
||||
else
|
||||
patchShebangs --host "$prefix"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user