tjh.dev
Revert "Revert "Revert "patch-shebangs: respect cross compilation"""
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 bde99096a80e74692795fa2782619c46a476839e.
+3
-50
pkgs/build-support/setup-hooks/patch-shebangs.sh
+3
-50
pkgs/build-support/setup-hooks/patch-shebangs.sh
···
5
5
# rewritten to /nix/store/<hash>/bin/python. Interpreters that are
6
6
# already in the store are left untouched.
7
7
8
-
fixupOutputHooks+=(patchShebangsAuto)
9
-
10
-
# Run patch shebangs on a directory.
11
-
# patchShebangs [--build | --host] directory
12
-
13
-
# Flags:
14
-
# --build : Lookup commands available at build-time
15
-
# --host : Lookup commands available at runtime
16
-
17
-
# Example use cases,
18
-
# $ patchShebangs --host /nix/store/...-hello-1.0/bin
19
-
# $ patchShebangs --build configure
8
+
fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
20
9
21
10
patchShebangs() {
22
-
local pathName
23
-
24
-
if [ "$1" = "--host" ]; then
25
-
pathName=HOST_PATH
26
-
shift
27
-
elif [ "$1" = "--build" ]; then
28
-
pathName=PATH
29
-
shift
30
-
fi
31
-
32
11
local dir="$1"
33
-
34
12
header "patching script interpreter paths in $dir"
35
13
local f
36
14
local oldPath
···
49
27
oldInterpreterLine=$(head -1 "$f" | tail -c+3)
50
28
read -r oldPath arg0 args <<< "$oldInterpreterLine"
51
29
52
-
if [ -z "$pathName" ]; then
53
-
if [ -n "$strictDeps" ] && [[ "$f" = "$NIX_STORE"* ]]; then
54
-
pathName=HOST_PATH
55
-
else
56
-
pathName=PATH
57
-
fi
58
-
fi
59
-
60
30
if $(echo "$oldPath" | grep -q "/bin/env$"); then
61
31
# Check for unsupported 'env' functionality:
62
32
# - options: something starting with a '-'
···
65
35
echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
66
36
exit 1
67
37
fi
68
-
69
-
newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"
38
+
newPath="$(command -v "$arg0" || true)"
70
39
else
71
40
if [ "$oldPath" = "" ]; then
72
41
# If no interpreter is specified linux will use /bin/sh. Set
73
42
# oldpath="/bin/sh" so that we get /nix/store/.../sh.
74
43
oldPath="/bin/sh"
75
44
fi
76
-
77
-
newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)"
78
-
45
+
newPath="$(command -v "$(basename "$oldPath")" || true)"
79
46
args="$arg0 $args"
80
47
fi
81
48
···
98
65
99
66
stopNest
100
67
}
101
-
102
-
patchShebangsAuto () {
103
-
if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
104
-
105
-
# Dev output will end up being run on the build platform. An
106
-
# example case of this is sdl2-config. Otherwise, we can just
107
-
# use the runtime path (--host).
108
-
if [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
109
-
patchShebangs --build "$prefix"
110
-
else
111
-
patchShebangs --host "$prefix"
112
-
fi
113
-
fi
114
-
}