Merge branch 'qmake-rpath'

pkgs/development/libraries/qt-5/5.5/qmake-hook.sh

@@ -68,6 +68,10 @@ _qtMultioutModuleDevs() {
     fi
 }
 
+_qtRmQtOut() {
+    rm -fr "$qtOut"
+}
+
 qmakeConfigurePhase() {
     runHook preConfigure
 
@@ -109,6 +113,8 @@ fi
 if [ -n "$NIX_QT_SUBMODULE" ]; then
     postInstallHooks+=(_qtRmQmake _qtRmModules)
     preFixupHooks+=(_qtMultioutModuleDevs)
+else
+    postInstallHooks+=(_qtRmQtOut)
 fi
 
 fi

pkgs/development/libraries/qt-5/5.6/qmake-hook.sh

@@ -74,6 +74,10 @@ _qtModuleMultioutDevsPost() {
     fi
 }
 
+_qtRmQtOut() {
+    rm -fr "$qtOut"
+}
+
 qmakeConfigurePhase() {
     runHook preConfigure
 
@@ -116,6 +120,8 @@ if [ -n "$NIX_QT_SUBMODULE" ]; then
     postInstallHooks+=(_qtRmQmake _qtRmModules)
     preFixupHooks+=(_qtModuleMultioutDevsPre)
     postFixupHooks+=(_qtModuleMultioutDevsPost)
+else
+    postInstallHooks+=(_qtRmQtOut)
 fi
 
 fi