From 8a3a3c7c4bf67bc4812279f53a789e9d8b695c59 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 1 Jul 2015 20:38:03 +0200 Subject: [PATCH] qt54: fix setup-hook.sh, lib/ was not populated in some cases --- pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh index af581f033ba4..8c1a6094dc5e 100644 --- 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 }