qtbase: Check for wrapQtAppsHook in setupHook

This commit is contained in:
Thomas Tuegel
2021-01-25 15:56:15 -06:00
parent 67b7cffaec
commit 5590e365e4
109 changed files with 225 additions and 8 deletions
@@ -14,7 +14,7 @@
assert withQt5 -> useQt4 == false;
assert useQt4 -> withQt5 == false;
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
pname = "cmake"
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI"
@@ -130,4 +130,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ttuegel lnl7 ];
license = licenses.bsd3;
};
}
} // (if withQt5 then { dontWrapQtApps = true; } else {})
)
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
dontWrapQtApps = true;
qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ];
buildInputs = [ qtbase qtscript ];