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

qtbase: include current package in runtime paths

Browse Source 
The runtime paths QT_PLUGIN_PATH, QML_IMPORT_PATH, QML2_IMPORT_PATH, and
XDG_DATA_DIRS did not include the appropriate paths from the current
package being built because addToSearchPath does not add directories
which don't exist.
This commit is contained in:
Thomas Tuegel 2015-10-07 08:48:40 -05:00
parent b102fa5a07
commit b44923561b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,10 +88,11 @@ Documentation = share/doc/qt5
EOF
export QMAKE="$qtOut/bin/qmake"
addToSearchPath QT_PLUGIN_PATH "$out/lib/qt5/plugins"
addToSearchPath QML_IMPORT_PATH "$out/lib/qt5/imports"
addToSearchPath QML2_IMPORT_PATH "$out/lib/qt5/qml"
addToSearchPath XDG_DATA_DIRS "$out/share"
# cannot use addToSearchPath because these directories may not exist yet
export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins"
export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports"
export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml"
export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share"
envHooks+=(addQtModule)
preConfigurePhases+=(setQMakePath)