stdenv: ignore duplicates in addToSearchPath (#113800)

2021-03-13 18:58:21 +00:00 · 2021-03-13 18:58:21 +00:00 · 6ba632c2a4
commit 6ba632c2a4
parent 86d56f10fc
1 changed files with 2 additions and 1 deletions
--- 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
 }