diff options
| author | Tobias Mayer <tobim@fastmail.fm> | 2019-06-28 10:00:46 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-03 08:50:18 +0200 |
| commit | d87c843b6fb3db0bd0ca94f107c69d4714a15263 (patch) | |
| tree | 4faeca406898cd9e30b54601f0c4d68ffe60787f /pkgs | |
| parent | 2608669904e122c404b8fe54b4be6c6df6b9ac30 (diff) | |
| download | nixpkgs-d87c843b6fb3db0bd0ca94f107c69d4714a15263.tar nixpkgs-d87c843b6fb3db0bd0ca94f107c69d4714a15263.tar.gz nixpkgs-d87c843b6fb3db0bd0ca94f107c69d4714a15263.tar.bz2 nixpkgs-d87c843b6fb3db0bd0ca94f107c69d4714a15263.tar.lz nixpkgs-d87c843b6fb3db0bd0ca94f107c69d4714a15263.tar.xz nixpkgs-d87c843b6fb3db0bd0ca94f107c69d4714a15263.tar.zst nixpkgs-d87c843b6fb3db0bd0ca94f107c69d4714a15263.zip | |
Integrate review suggestions
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 4912049cbf6..4761d8dc5b1 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -13,21 +13,18 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -let - lib = stdenv.lib; - os = lib.optionalString; - version = "3.14.5"; - # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; -in - stdenv.mkDerivation rec { - pname = "cmake${os isBootstrap "-boot"}${os useNcurses "-cursesUI"}${os withQt5 "-qt5UI"}${os useQt4 "-qt4UI"}"; - inherit version; + pname = "cmake" + + lib.optionalString isBootstrap "-boot" + + lib.optionalString useNcurses "-cursesUI" + + lib.optionalString withQt5 "-qt5UI" + + lib.optionalString useQt4 "-qt4UI"; + version = "3.14.5"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - inherit sha256; + # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt + sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; }; patches = [ |