cmake: Update to latest upstream (2.8.12.2).
This commit is contained in:
parent
25a7190336
commit
abd8059802
@ -7,7 +7,7 @@ with stdenv.lib;
|
|||||||
let
|
let
|
||||||
os = stdenv.lib.optionalString;
|
os = stdenv.lib.optionalString;
|
||||||
majorVersion = "2.8";
|
majorVersion = "2.8";
|
||||||
minorVersion = "11.2";
|
minorVersion = "12.2";
|
||||||
version = "${majorVersion}.${minorVersion}";
|
version = "${majorVersion}.${minorVersion}";
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -18,19 +18,15 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
|
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
|
||||||
sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
|
sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
patches =
|
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
|
# Don't search in non-Nix locations such as /usr, but do search in
|
||||||
# Nixpkgs' Glibc.
|
# Nixpkgs' Glibc.
|
||||||
++ optional (stdenv ? glibc) ./search-path.patch;
|
optional (stdenv ? glibc) ./search-path.patch;
|
||||||
|
|
||||||
buildInputs = [ curl expat zlib bzip2 libarchive ]
|
buildInputs = [ curl expat zlib bzip2 libarchive ]
|
||||||
++ optional useNcurses ncurses
|
++ optional useNcurses ncurses
|
||||||
|
Loading…
x
Reference in New Issue
Block a user