diff options
| author | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-29 20:35:52 +0800 |
|---|---|---|
| committer | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-29 20:35:52 +0800 |
| commit | 3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd (patch) | |
| tree | 67390286586ef4af0342cfaf82962cfb96da9435 /pkgs/stdenv/generic/setup.sh | |
| parent | a998a49ee4f2f0461a93e9c9524654b845a8139e (diff) | |
| parent | a2c6dbe370160ffea5537f64dda04489184c5ce1 (diff) | |
| download | nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.gz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.bz2 nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.lz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.xz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.zst nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.zip | |
Merge branch 'master' into cross-compiling-postgresql
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index c5feffcea99b..8b98aac1146d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -504,6 +504,10 @@ activatePackage() { addToSearchPath _PATH "$pkg/bin" fi + if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then + addToSearchPath HOST_PATH "$pkg/bin" + fi + if [[ -f "$pkg/nix-support/setup-hook" ]]; then local oldOpts="$(shopt -po nounset)" set +u |