diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-03-10 17:17:18 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-03-10 17:17:18 +0100 |
| commit | 1e579d1fe46c3c8dc737da99d46d6615fe67d52c (patch) | |
| tree | f0241e5a01734167ff41cd7a676f9a6a2c231b6c /pkgs/development/tools | |
| parent | a7db7b576c03d3c3c18dd8aac05c2374107137ac (diff) | |
| parent | 60c646c031011c2e28ab6671f4704e469c047b45 (diff) | |
| download | nixlib-1e579d1fe46c3c8dc737da99d46d6615fe67d52c.tar nixlib-1e579d1fe46c3c8dc737da99d46d6615fe67d52c.tar.gz nixlib-1e579d1fe46c3c8dc737da99d46d6615fe67d52c.tar.bz2 nixlib-1e579d1fe46c3c8dc737da99d46d6615fe67d52c.tar.lz nixlib-1e579d1fe46c3c8dc737da99d46d6615fe67d52c.tar.xz nixlib-1e579d1fe46c3c8dc737da99d46d6615fe67d52c.tar.zst nixlib-1e579d1fe46c3c8dc737da99d46d6615fe67d52c.zip | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 4eb531f59a8d..0a6335a3eb72 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.16.4"; + version = "3.16.5"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v"; + sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz"; }; patches = [ @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { - homepage = http://www.cmake.org/; + homepage = "http://www.cmake.org/"; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; |