summaryrefslogtreecommitdiffstats
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorVincenzo Mantova <xworld21@users.sf.net>2021-03-13 18:58:21 +0000
committerGitHub <noreply@github.com>2021-03-13 13:58:21 -0500
commit6ba632c2a442082f353bf2d7028fda11a888d099 (patch)
treee6b67f2495299d27cb8525f9e2860a16b19328dc /pkgs/stdenv
parent86d56f10fc22687aa5af4c5cbb2edcc7094be2ab (diff)
stdenv: ignore duplicates in addToSearchPath (#113800)
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/setup.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 7168ce4084c8..a73474c952e5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -157,7 +157,8 @@ addToSearchPathWithCustomDelimiter() {
local delimiter="$1"
local varName="$2"
local dir="$3"
- if [ -d "$dir" ]; then
+ if [[ -d "$dir" && "${!varName:+${delimiter}${!varName}${delimiter}}" \
+ != *"${delimiter}${dir}${delimiter}"* ]]; then
export "${varName}=${!varName:+${!varName}${delimiter}}${dir}"
fi
}