qt54: fix setup-hook.sh, lib/ was not populated in some cases

2015-07-01 20:38:03 +02:00 · 2015-07-01 20:38:03 +02:00 · 8a3a3c7c4b
commit 8a3a3c7c4b
parent 0cc53d0711
1 changed files with 4 additions and 2 deletions
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@ -20,9 +20,11 @@ addQtModule() {
            fi
        fi

-        if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then
+        if [[ -d "$1/lib" ]]; then
            @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
-            find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            if [[ -n $qtSubmodule ]]; then
+                find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            fi
        fi
    fi
 }