diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh index 2669a396280..5401a71bc4c 100644 --- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh +++ b/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 diff --git a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh index cf3803a1b9c..9fd4735209c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh +++ b/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