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

cmake: 3.6.2 -> 3.7.1

Browse Source
This commit is contained in:
Aristid Breitkreuz 2016-12-20 16:20:08 +01:00
parent ec4d73573a
commit 76c4b5fcca
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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 , bzip2, curl, expat, libarchive, xz, zlib, libuv
, useNcurses ? false, ncurses, useQt4 ? false, qt4 , useNcurses ? false, ncurses, useQt4 ? false, qt4
, wantPS ? false, ps ? null , wantPS ? false, ps ? null
}: }:
@ -12,8 +12,8 @@ assert stdenv.cc ? libc;
let let
os = stdenv.lib.optionalString; os = stdenv.lib.optionalString;
majorVersion = "3.6"; majorVersion = "3.7";
minorVersion = "2"; minorVersion = "1";
version = "${majorVersion}.${minorVersion}"; version = "${majorVersion}.${minorVersion}";
in in
@ -24,7 +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";
sha256 = "0imkz04ncz6cv5659qfd4scm99k3siq7zrrsa8pvp663d8mf76hq"; # from https://cmake.org/files/v3.7/cmake-3.7.1-SHA-256.txt
sha256 = "449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1";
}; };
# Don't search in non-Nix locations such as /usr, but do search in our libc. # Don't search in non-Nix locations such as /usr, but do search in our libc.
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
buildInputs = buildInputs =
[ setupHook pkgconfig bzip2 curl expat libarchive xz zlib ] [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib libuv ]
++ optional useNcurses ncurses ++ optional useNcurses ncurses
++ optional useQt4 qt4; ++ optional useQt4 qt4;