Author: urkud
Date: Wed Feb 9 21:08:53 2011
New Revision: 25859
URL: https://svn.nixos.org/websvn/nix/?rev=25859&sc=1
Log:
cmake-2.8.3
Modified:
nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/setup-hook.sh
Modified: nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
Wed Feb 9 20:34:52 2011 (r25858)
+++ nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
Wed Feb 9 21:08:53 2011 (r25859)
@@ -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 @@
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 =
Modified:
nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/setup-hook.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/setup-hook.sh
Wed Feb 9 20:34:52 2011 (r25858)
+++ nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/setup-hook.sh
Wed Feb 9 21:08:53 2011 (r25859)
@@ -52,7 +52,7 @@
fi
if test -n "$crossConfig"; then
- crossEnvHooks=(${crossEnvHooks[@]} addCMakeParams)
+ crossEnvHooks+=(addCMakeParams)
else
- envHooks=(${envHooks[@]} addCMakeParams)
+ envHooks+=(addCMakeParams)
fi
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
