From abd80598024eadc6761d4fe5b67bfac8a66bf0fa Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 29 Jan 2014 23:42:11 +0100 Subject: [PATCH] cmake: Update to latest upstream (2.8.12.2). --- .../development/tools/build-managers/cmake/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c71592c8ec8f..9ce69374cd88 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "11.2"; + minorVersion = "12.2"; version = "${majorVersion}.${minorVersion}"; in @@ -18,19 +18,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk"; + sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; }; enableParallelBuilding = true; patches = - # See https://github.com/NixOS/nixpkgs/issues/762 - # and http://public.kitware.com/Bug/view.php?id=13887 - # Remove this patch when a CMake release contains the corresponding fix - [ ./762-13887.patch ] # Don't search in non-Nix locations such as /usr, but do search in # Nixpkgs' Glibc. - ++ optional (stdenv ? glibc) ./search-path.patch; + optional (stdenv ? glibc) ./search-path.patch; buildInputs = [ curl expat zlib bzip2 libarchive ] ++ optional useNcurses ncurses