Merge branch 'qt5'

NixOS · Jul 1, 2015 · 32a1be4 · 32a1be4
2 parents b6db9b9 + 036f11f
commit 32a1be4
Showing 1 changed file with 4 additions and 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
@@ -44,10 +44,11 @@ cp "@out@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
-Plugins = $qtOut/lib/qt5/plugins
-Imports = $qtOut/lib/qt5/imports
-Qml2Imports = $qtOut/lib/qt5/qml
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
 EOF
+export QMAKE="$qtOut/bin/qmake"
 
 envHooks+=(addQtModule)
 preConfigurePhases+=" setQMakePath"