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

cmake-2.8.3 

svn path=/nixpkgs/trunk/; revision=25859
This commit is contained in:
Yury G. Kudryashov 2011-02-09 21:08:53 +00:00
parent 42f818969d
commit 2e92a0cd12
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,11 @@
{fetchurl, stdenv, replace, curl, expat, zlib {fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
, useNcurses ? false, ncurses, useQt4 ? false, qt4}: , useNcurses ? false, ncurses, useQt4 ? false, qt4}:
let let
os = stdenv.lib.optionalString; os = stdenv.lib.optionalString;
inherit (stdenv.lib) optional;
majorVersion = "2.8"; majorVersion = "2.8";
minorVersion = "1"; minorVersion = "3";
version = "${majorVersion}.${minorVersion}"; version = "${majorVersion}.${minorVersion}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,12 +15,12 @@ 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 = "0hi28blqxvir0dkhln90sgr0m3ri9n2i3hlmwdl4m5vkfsmp9bky"; sha256 = "1262bz0c0g5c57ba7rbbrs72xa42xs26fwf72mazmkmmhqkx17k8";
}; };
buildInputs = [ curl expat zlib ] buildInputs = [ curl expat zlib bzip2 libarchive ]
++ stdenv.lib.optional useNcurses ncurses ++ optional useNcurses ncurses
++ stdenv.lib.optional useQt4 qt4; ++ optional useQt4 qt4;
CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
configureFlags = configureFlags =

4
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -52,7 +52,7 @@ if test -z "$dontUseCmakeConfigure"; then
fi fi
if test -n "$crossConfig"; then if test -n "$crossConfig"; then
crossEnvHooks=(${crossEnvHooks[@]} addCMakeParams) crossEnvHooks+=(addCMakeParams)
else else
envHooks=(${envHooks[@]} addCMakeParams) envHooks+=(addCMakeParams)
fi fi