From a122ca8ba3363b4c595e036099c073c1d61dc77f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 9 Oct 2015 18:20:53 -0500 Subject: [PATCH] qt55.qtbase: add makeQtWrapper --- .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 5bfc672559cb..cae1aeaac2cc 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 @@ -50,7 +50,21 @@ setQMakePath() { } wrapQtProgram() { - wrapProgram "$1" \ + local prog="$1" + shift + wrapProgram "$prog" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + "$@" +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + makeWrapper "$old" "$new" \ --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \