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

cmake: add withQt5 option and make it the default

This commit is contained in:
Bernd Amend 2017-09-04 00:54:34 +02:00 committed by Thomas Tuegel
parent f3ac052f24
commit b49b9da3ce
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -6,8 +6,12 @@
, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
, useNcurses ? false, ncurses , useNcurses ? false, ncurses
, useQt4 ? false, qt4 , useQt4 ? false, qt4
, withQt5 ? false, qtbase
}: }:
assert withQt5 -> useQt4 == false;
assert useQt4 -> withQt5 == false;
with stdenv.lib; with stdenv.lib;
let let
@ -18,7 +22,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os withQt5 "qt5UI-"}${os useQt4 "qt4UI-"}${version}";
inherit majorVersion; inherit majorVersion;
@ -46,7 +50,8 @@ stdenv.mkDerivation rec {
[ setupHook pkgconfig ] [ setupHook pkgconfig ]
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ optional useNcurses ncurses ++ optional useNcurses ncurses
++ optional useQt4 qt4; ++ optional useQt4 qt4
++ optional withQt5 qtbase;
propagatedBuildInputs = optional stdenv.isDarwin ps; propagatedBuildInputs = optional stdenv.isDarwin ps;
@ -63,7 +68,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--docdir=share/doc/${name}" ] configureFlags = [ "--docdir=share/doc/${name}" ]
++ (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
++ optional useQt4 "--qt-gui" ++ optional (useQt4 || withQt5) "--qt-gui"
++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ]; ++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ];
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;

5
pkgs/top-level/all-packages.nix
View File

@ -6882,13 +6882,14 @@ with pkgs;
inherit (darwin) ps; inherit (darwin) ps;
}; };
cmake = callPackage ../development/tools/build-managers/cmake { cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake {
inherit (darwin) ps; inherit (darwin) ps;
}; };
cmakeCurses = cmake.override { useNcurses = true; }; cmakeCurses = cmake.override { useNcurses = true; };
cmakeWithGui = cmakeCurses.override { useQt4 = true; }; cmakeWithGui = cmakeCurses.override { withQt5 = true; };
cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; };
# Does not actually depend on Qt 5 # Does not actually depend on Qt 5
inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools; inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;