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

qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat

Browse Source 
Fixes duplicate linkings issue for Qt-Frameworks provided by qtbase
during configurePhase.
This commit is contained in:
Periklis Tsirakidis 2017-03-13 11:49:30 +01:00
parent 8498f979a1
commit a6be98c9c1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
View File

@ -135,10 +135,14 @@ qt5LinkModuleDir() {
qt5LinkDarwinModuleLibDir() { qt5LinkDarwinModuleLibDir() {
for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do
if [ ! -L "$fw" ]; then
ln -s "$fw" "$NIX_QT5_TMP"/lib ln -s "$fw" "$NIX_QT5_TMP"/lib
fi
done done
for file in $(find "$1"/lib -maxdepth 1 -type f); do for file in $(find "$1"/lib -maxdepth 1 -type f); do
if [ ! -L "$file" ]; then
ln -s "$file" "$NIX_QT5_TMP"/lib ln -s "$file" "$NIX_QT5_TMP"/lib
fi
done done
for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do
mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir") mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir")
@ -178,4 +182,3 @@ _qtFixCMakePaths() {
if [ -n "$NIX_QT_SUBMODULE" ]; then if [ -n "$NIX_QT_SUBMODULE" ]; then
postInstallHooks+=(_qtFixCMakePaths) postInstallHooks+=(_qtFixCMakePaths)
fi fi