diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-27 09:10:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-27 09:11:37 +0100 |
| commit | ef60e411455c9d7ef16069df63daf2c9fbd66ec6 (patch) | |
| tree | b02dc7912d39d129a845bfd4dc3019dbd1666f9d /pkgs/development/tools/build-managers | |
| parent | f83b6e1130e3193dd9480ca5d60b764870de9d3f (diff) | |
| download | nixpkgs-ef60e411455c9d7ef16069df63daf2c9fbd66ec6.tar nixpkgs-ef60e411455c9d7ef16069df63daf2c9fbd66ec6.tar.gz nixpkgs-ef60e411455c9d7ef16069df63daf2c9fbd66ec6.tar.bz2 nixpkgs-ef60e411455c9d7ef16069df63daf2c9fbd66ec6.tar.lz nixpkgs-ef60e411455c9d7ef16069df63daf2c9fbd66ec6.tar.xz nixpkgs-ef60e411455c9d7ef16069df63daf2c9fbd66ec6.tar.zst nixpkgs-ef60e411455c9d7ef16069df63daf2c9fbd66ec6.zip | |
cmake: bring back 3.9 for Darwin bootstrap
Broken by ba6e0ae33df36; see e.g. https://hydra.nixos.org/build/68223628
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9357c1a3a85..fed88561cf9 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, majorVersion ? "3.10" # darwin attributes , ps , isBootstrap ? false @@ -14,10 +15,23 @@ assert useQt4 -> withQt5 == false; with stdenv.lib; +with ( + { + "3.10" = { + minorVersion = "2"; + sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; + }; + "3.9" = { + minorVersion = "6"; + sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218"; + }; + + }.${majorVersion} + or (abort ''Unsupported configuration for cmake: majorVersion = "${majorVersion}";'') +); + let os = stdenv.lib.optionalString; - majorVersion = "3.10"; - minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -29,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; # from https://cmake.org/files/v3.10/cmake-3.10.2-SHA-256.txt - sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; + inherit sha256; }; prePatch = optionalString (!useSharedLibraries) '' |