diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-02 20:02:45 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:54:49 -0400 |
| commit | ec7d72a57d5ba18a35451b174e2f3c8d4a425b94 (patch) | |
| tree | 9a4b7f7793abbf0c7d417de348b1144481bd3fb0 /pkgs/stdenv/generic | |
| parent | a1533dfc414961bb723937c111f5fe0925411f75 (diff) | |
| download | nixpkgs-ec7d72a57d5ba18a35451b174e2f3c8d4a425b94.tar nixpkgs-ec7d72a57d5ba18a35451b174e2f3c8d4a425b94.tar.gz nixpkgs-ec7d72a57d5ba18a35451b174e2f3c8d4a425b94.tar.bz2 nixpkgs-ec7d72a57d5ba18a35451b174e2f3c8d4a425b94.tar.lz nixpkgs-ec7d72a57d5ba18a35451b174e2f3c8d4a425b94.tar.xz nixpkgs-ec7d72a57d5ba18a35451b174e2f3c8d4a425b94.tar.zst nixpkgs-ec7d72a57d5ba18a35451b174e2f3c8d4a425b94.zip | |
setup.sh: make sure initialPath goes at end of HOST_PATH
We want initialPath to have lowest precedence. In addition, unset _PATH and _HOST_PATH as they shouldn’t be needed after final PATH and HOST_PATH are set.
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 8dff3557807..6f1a654a38a 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -182,10 +182,8 @@ addToSearchPathWithCustomDelimiter() { fi } -PATH_DELIMITER=':' - addToSearchPath() { - addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" + addToSearchPathWithCustomDelimiter ":" "$@" } # Add $1/lib* into rpaths. @@ -508,7 +506,7 @@ activatePackage() { fi if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then - addToSearchPath HOST_PATH "$pkg/bin" + addToSearchPath _HOST_PATH "$pkg/bin" fi if [[ -f "$pkg/nix-support/setup-hook" ]]; then @@ -617,10 +615,15 @@ fi PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH" +HOST_PATH="${_HOST_PATH-}${_HOST_PATH:+${HOST_PATH:+:}}$HOST_PATH" if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "final path: $PATH" + echo "final host path: $HOST_PATH" fi +unset _PATH +unset _HOST_PATH + # Make GNU Make produce nested output. export NIX_INDENT_MAKE=1 |