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

Updated CMake to version 2.6.3.

Browse Source 
svn path=/nixpkgs/trunk/; revision=15114
This commit is contained in:
Peter Simons 2009-04-17 13:48:22 +00:00
parent 2796d3a185
commit 047f6d20d5
3 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/tools/build-managers/cmake/2.6.3.nix
View File

@ -1,31 +0,0 @@
{fetchurl, stdenv, replace, ncurses}:
stdenv.mkDerivation rec {
name = "cmake-2.6.3-RC-15";
# We look for cmake modules in .../share/cmake-${majorVersion}/Modules.
majorVersion = "2.6";
setupHook = ./setup-hook.sh;
meta = {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
};
src = fetchurl {
url = "http://www.cmake.org/files/v2.6/${name}.tar.gz";
sha256 = "476b6daca63c39bc46955f99f2566735d51159c43ccc716fa689ba2a2fa7e432";
};
postUnpack = ''
dontUseCmakeConfigure=1
source $setupHook
fixCmakeFiles $sourceRoot
echo 'SET (CMAKE_SYSTEM_PREFIX_PATH "'${ncurses}'" CACHE FILEPATH "Root for libs for cmake" FORCE)' > $sourceRoot/cmakeInit.txt
'';
configureFlags= [ " --init=cmakeInit.txt " ];
postInstall = "fixCmakeFiles $out/share";
}

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

@ -1,7 +1,7 @@
{fetchurl, stdenv, replace, ncurses}: {fetchurl, stdenv, replace, ncurses}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cmake-2.6.2"; name = "cmake-2.6.3";
# We look for cmake modules in .../share/cmake-${majorVersion}/Modules. # We look for cmake modules in .../share/cmake-${majorVersion}/Modules.
majorVersion = "2.6"; majorVersion = "2.6";
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
}; };
src = fetchurl { src = fetchurl {
url = "http://www.cmake.org/files/v2.6/${name}.tar.gz"; url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz";
sha256 = "b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9"; sha256 = "3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450";
}; };
postUnpack = '' postUnpack = ''

4
pkgs/top-level/all-packages.nix
View File

@ -2410,10 +2410,6 @@ let
inherit fetchurl stdenv replace ncurses; inherit fetchurl stdenv replace ncurses;
}; };
cmakeUnstable = lowPrio (import ../development/tools/build-managers/cmake/2.6.3.nix {
inherit fetchurl stdenv replace ncurses;
});
cproto = import ../development/tools/misc/cproto { cproto = import ../development/tools/misc/cproto {
inherit fetchurl stdenv flex bison; inherit fetchurl stdenv flex bison;
}; };