From b44923561b49595d5f3d5727c1d3971029f9f6dc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 08:48:40 -0500 Subject: [PATCH] qtbase: include current package in runtime paths 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. --- pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 9f1bafc9f49..15d4818ccc7 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -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)