1 files changed, 5 insertions, 4 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 ac76590d1174..8ab4071becfb 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -28,15 +28,15 @@ addQtModule() {
         propagatedBuildInputs+=" $1"
     fi
 
-    if [[ -f "$1/bin/qmake" ]]; then
-        addToSearchPath PATH "$qtOut/bin"
-    fi
-
     if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
         propagatedUserEnvPkgs+=" $1"
     fi
 }
 
+setQMakePath() {
+    export PATH="$qtOut/bin${PATH:+:}$PATH"
+}
+
 qtOut=""
 if [[ -z $qtSubmodule ]]; then
     qtOut="$PWD/qmake-$name"
@@ -56,3 +56,4 @@ Qml2Imports = $qtOut/lib/qt5/qml
 EOF
 
 envHooks+=(addQtModule)
+preConfigurePhases+=" setQMakePath"