alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

qt56.qtbase: create symlink farm in one pass

Browse source
This commit is contained in:
Thomas Tuegel 2016-05-31 06:27:18 -05:00
parent 8ec5adc953
commit ca34e075e4
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
View file

@ -112,7 +112,7 @@ EOF
# Set PATH to find qmake first in a preConfigure hook
# It must run after all the envHooks!
postHooks+=(_qtSetQmakePath)
preConfigureHooks+=(_qtSetQmakePath)
fi
qt5LinkModuleDir() {
@ -122,10 +122,23 @@ qt5LinkModuleDir() {
fi
}
qt5LinkModuleDir @out@ "lib"
NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
qt5LinkModuleDir @dev@ "bin"
qt5LinkModuleDir @dev@ "include"
qt5LinkModuleDir @dev@ "lib"
qt5LinkModuleDir @dev@ "mkspecs"
qt5LinkModuleDir @dev@ "share"
_qtLinkAllModules() {
IFS=: read -a modules <<< $NIX_QT5_MODULES
for module in ${modules[@]}; do
qt5LinkModuleDir "$module" "lib"
done
IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV
for module in ${modules[@]}; do
qt5LinkModuleDir "$module" "bin"
qt5LinkModuleDir "$module" "include"
qt5LinkModuleDir "$module" "lib"
qt5LinkModuleDir "$module" "mkspecs"
qt5LinkModuleDir "$module" "share"
done
}
preConfigureHooks+=(_qtLinkAllModules)

9
pkgs/development/libraries/qt-5/5.6/setup-hook.sh
View file

@ -1,7 +1,2 @@
qt5LinkModuleDir @out@ "lib"
qt5LinkModuleDir @dev@ "bin"
qt5LinkModuleDir @dev@ "include"
qt5LinkModuleDir @dev@ "lib"
qt5LinkModuleDir @dev@ "mkspecs"
qt5LinkModuleDir @dev@ "share"
NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"