diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-02-09 21:08:53 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-02-09 21:08:53 +0000 |
| commit | 2e92a0cd126dc1ab06e9853c2919036d6026a633 (patch) | |
| tree | be8cd9e110e9864fa07911f83073f97010a683df /pkgs/development/tools/build-managers | |
| parent | 42f818969d346e74e090aff13dd136c09f69e384 (diff) | |
| download | nixlib-2e92a0cd126dc1ab06e9853c2919036d6026a633.tar nixlib-2e92a0cd126dc1ab06e9853c2919036d6026a633.tar.gz nixlib-2e92a0cd126dc1ab06e9853c2919036d6026a633.tar.bz2 nixlib-2e92a0cd126dc1ab06e9853c2919036d6026a633.tar.lz nixlib-2e92a0cd126dc1ab06e9853c2919036d6026a633.tar.xz nixlib-2e92a0cd126dc1ab06e9853c2919036d6026a633.tar.zst nixlib-2e92a0cd126dc1ab06e9853c2919036d6026a633.zip | |
cmake-2.8.3
svn path=/nixpkgs/trunk/; revision=25859
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 13 | ||||
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 2df6d96219de..84a41db541ac 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,10 +1,11 @@ -{fetchurl, stdenv, replace, curl, expat, zlib +{fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive , useNcurses ? false, ncurses, useQt4 ? false, qt4}: let os = stdenv.lib.optionalString; + inherit (stdenv.lib) optional; majorVersion = "2.8"; - minorVersion = "1"; + minorVersion = "3"; version = "${majorVersion}.${minorVersion}"; in stdenv.mkDerivation rec { @@ -14,12 +15,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0hi28blqxvir0dkhln90sgr0m3ri9n2i3hlmwdl4m5vkfsmp9bky"; + sha256 = "1262bz0c0g5c57ba7rbbrs72xa42xs26fwf72mazmkmmhqkx17k8"; }; - buildInputs = [ curl expat zlib ] - ++ stdenv.lib.optional useNcurses ncurses - ++ stdenv.lib.optional useQt4 qt4; + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; configureFlags = diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 21d71628c077..c523e849fc15 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -52,7 +52,7 @@ if test -z "$dontUseCmakeConfigure"; then fi if test -n "$crossConfig"; then - crossEnvHooks=(${crossEnvHooks[@]} addCMakeParams) + crossEnvHooks+=(addCMakeParams) else - envHooks=(${envHooks[@]} addCMakeParams) + envHooks+=(addCMakeParams) fi |