From 9333155666844d7512309a3bac91e719256d4f6a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 1 Jul 2015 12:14:33 -0500 Subject: [PATCH 1/2] qt5: set paths correctly --- pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh index af581f033ba..10b684630df 100644 --- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh @@ -44,9 +44,9 @@ cp "@out@/bin/qmake" "$qtOut/bin" cat >"$qtOut/bin/qt.conf" < Date: Wed, 1 Jul 2015 12:14:43 -0500 Subject: [PATCH 2/2] qt5: set location to qmake in setup-hook --- pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh index 10b684630df..82d4ed5af92 100644 --- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh @@ -48,6 +48,7 @@ Plugins = lib/qt5/plugins Imports = lib/qt5/imports Qml2Imports = lib/qt5/qml EOF +export QMAKE="$qtOut/bin/qmake" envHooks+=(addQtModule) preConfigurePhases+=" setQMakePath"