JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: 3.7.2 -> 3.8.2

Browse Source 
Tested several cmake-built packages, and all seems OK;
hopefully there won't be many problems.
This commit is contained in:
Vladimír Čunát 2017-06-11 15:27:33 +02:00
parent 8779c108d4
commit d74d871f52
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
# darwin attributes # darwin attributes
, ps , ps
, isBootstrap ? false , isBootstrap ? false
@ -12,7 +12,7 @@ with stdenv.lib;
let let
os = stdenv.lib.optionalString; os = stdenv.lib.optionalString;
majorVersion = "3.7"; majorVersion = "3.8";
minorVersion = "2"; minorVersion = "2";
version = "${majorVersion}.${minorVersion}"; version = "${majorVersion}.${minorVersion}";
in in
@ -24,8 +24,8 @@ 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";
# from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt # from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0"; sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d";
}; };
prePatch = optionalString (!useSharedLibraries) '' prePatch = optionalString (!useSharedLibraries) ''
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ setupHook pkgconfig ] [ setupHook pkgconfig ]
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ] ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ optional useNcurses ncurses ++ optional useNcurses ncurses
++ optional useQt4 qt4; ++ optional useQt4 qt4;