Merge #122696: cmakeWithQt4Gui: drop

This commit is contained in:
Vladimír Čunát 2021-05-22 15:51:14 +02:00
commit 7f651d15e2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 4 additions and 10 deletions

View File

@ -7,19 +7,14 @@
, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
, useOpenSSL ? !isBootstrap, openssl
, useNcurses ? false, ncurses
, useQt4 ? false, qt4
, withQt5 ? false, qtbase
}:
assert withQt5 -> useQt4 == false;
assert useQt4 -> withQt5 == false;
stdenv.mkDerivation (rec {
pname = "cmake"
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
+ lib.optionalString withQt5 "-qt5UI";
version = "3.19.7";
src = fetchurl {
@ -53,7 +48,6 @@ stdenv.mkDerivation (rec {
++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
++ lib.optional useOpenSSL openssl
++ lib.optional useNcurses ncurses
++ lib.optional useQt4 qt4
++ lib.optional withQt5 qtbase;
propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
@ -73,7 +67,7 @@ stdenv.mkDerivation (rec {
configureFlags = [
"--docdir=share/doc/${pname}${version}"
] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
++ lib.optional (useQt4 || withQt5) "--qt-gui"
++ lib.optional withQt5 "--qt-gui"
# Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
++ lib.optionals stdenv.hostPlatform.is32bit [
"CFLAGS=-D_FILE_OFFSET_BITS=64"
@ -124,7 +118,7 @@ stdenv.mkDerivation (rec {
configuration files, and generate native makefiles and workspaces that
can be used in the compiler environment of your choice.
'';
platforms = if useQt4 then qt4.meta.platforms else platforms.all;
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel lnl7 ];
license = licenses.bsd3;
};

View File

@ -115,6 +115,7 @@ mapAliases ({
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05
codimd = hedgedoc; # added 2020-11-29
compton = picom; # added 2019-12-02
compton-git = compton; # added 2019-05-20

View File

@ -12871,7 +12871,6 @@ in
cmakeCurses = cmake.override { useNcurses = true; };
cmakeWithGui = cmakeCurses.override { withQt5 = true; };
cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; };
cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };