public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pascal Wittmann 2015-07-01 20:38:03 +02:00
parent 0cc53d0711
commit 8a3a3c7c4b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/5.4/setup-hook.sh
View File

@ -20,11 +20,13 @@ addQtModule() {
fi fi
fi fi
if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then if [[ -d "$1/lib" ]]; then
@lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib" @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
if [[ -n $qtSubmodule ]]; then
find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs" find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
fi fi
fi fi
fi
} }
setQMakePath() { setQMakePath() {