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

qt56.qtbase: don't use propagatedUserEnvPkgs

Browse Source 
Fixes #15498.
This commit is contained in:
Thomas Tuegel 2016-07-15 07:37:38 -05:00
parent 5e5165ec6f
commit d19dc420d2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ _qtPropagate() {
for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
if [ -d "$1/$dir" ]; then if [ -d "$1/$dir" ]; then
propagateOnce propagatedBuildInputs "$1" propagateOnce propagatedBuildInputs "$1"
propagateOnce propagatedUserEnvPkgs "$1"
break break
fi fi
done done
@ -43,9 +42,6 @@ _qtPropagateNative() {
for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
if [ -d "$1/$dir" ]; then if [ -d "$1/$dir" ]; then
propagateOnce propagatedNativeBuildInputs "$1" propagateOnce propagatedNativeBuildInputs "$1"
if [ -z "$crossConfig" ]; then
propagateOnce propagatedUserEnvPkgs "$1"
fi
break break
fi fi
done done