public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmakeWithQt4Gui: drop

Browse Source 
Support for Qt 4 was removed in CMake 3.19.0:
https://cmake.org/cmake/help/latest/release/3.19.html#deprecated-and-removed-features
This commit is contained in:
Alyssa Ross
2021-05-12 11:31:12 +00:00
parent c58155c87c
commit 02f013b8a4
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/cmake/default.nix
+3 -9
View File
@@ -7,19 +7,14 @@
, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
, useOpenSSL ? !isBootstrap, openssl , useOpenSSL ? !isBootstrap, openssl
, useNcurses ? false, ncurses , useNcurses ? false, ncurses
, useQt4 ? false, qt4
, withQt5 ? false, qtbase , withQt5 ? false, qtbase
}: }:
assert withQt5 -> useQt4 == false;
assert useQt4 -> withQt5 == false;
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "cmake" pname = "cmake"
+ lib.optionalString isBootstrap "-boot" + lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI" + lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI" + lib.optionalString withQt5 "-qt5UI";
+ lib.optionalString useQt4 "-qt4UI";
version = "3.19.7"; version = "3.19.7";
src = fetchurl { src = fetchurl {
@@ -53,7 +48,6 @@ stdenv.mkDerivation (rec {
++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
++ lib.optional useOpenSSL openssl ++ lib.optional useOpenSSL openssl
++ lib.optional useNcurses ncurses ++ lib.optional useNcurses ncurses
++ lib.optional useQt4 qt4
++ lib.optional withQt5 qtbase; ++ lib.optional withQt5 qtbase;
propagatedBuildInputs = lib.optional stdenv.isDarwin ps; propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
@@ -73,7 +67,7 @@ stdenv.mkDerivation (rec {
configureFlags = [ configureFlags = [
"--docdir=share/doc/${pname}${version}" "--docdir=share/doc/${pname}${version}"
] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ] ++ (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 # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
++ lib.optionals stdenv.hostPlatform.is32bit [ ++ lib.optionals stdenv.hostPlatform.is32bit [
"CFLAGS=-D_FILE_OFFSET_BITS=64" "CFLAGS=-D_FILE_OFFSET_BITS=64"
@@ -124,7 +118,7 @@ stdenv.mkDerivation (rec {
configuration files, and generate native makefiles and workspaces that configuration files, and generate native makefiles and workspaces that
can be used in the compiler environment of your choice. 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 ]; maintainers = with maintainers; [ ttuegel lnl7 ];
license = licenses.bsd3; license = licenses.bsd3;
}; };
pkgs/top-level/all-packages.nix
-1
View File
@@ -12762,7 +12762,6 @@ in
cmakeCurses = cmake.override { useNcurses = true; }; cmakeCurses = cmake.override { useNcurses = true; };
cmakeWithGui = cmakeCurses.override { withQt5 = true; }; cmakeWithGui = cmakeCurses.override { withQt5 = true; };
cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; };
cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };