diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-10 17:41:51 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-10 17:41:51 +0000 |
| commit | e2751942c733c1fe4974ea1108076bd3ad066a2a (patch) | |
| tree | d4643994b741b046b055b19d1a83fabf3d5a4450 | |
| parent | b5b189bed8426ff6d1e3047c9cf5bfd57778a02d (diff) | |
| download | nixlib-e2751942c733c1fe4974ea1108076bd3ad066a2a.tar nixlib-e2751942c733c1fe4974ea1108076bd3ad066a2a.tar.gz nixlib-e2751942c733c1fe4974ea1108076bd3ad066a2a.tar.bz2 nixlib-e2751942c733c1fe4974ea1108076bd3ad066a2a.tar.lz nixlib-e2751942c733c1fe4974ea1108076bd3ad066a2a.tar.xz nixlib-e2751942c733c1fe4974ea1108076bd3ad066a2a.tar.zst nixlib-e2751942c733c1fe4974ea1108076bd3ad066a2a.zip | |
cmake: 2.4.8 added
svn path=/nixpkgs/branches/stdenv-updates/; revision=10611
5 files changed, 26 insertions, 21 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/2.4.7.nix b/pkgs/development/tools/build-managers/cmake/2.4.7.nix new file mode 100644 index 000000000000..a731d0a4d7d5 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.4.7.nix @@ -0,0 +1,3 @@ +args: (import ./common.nix) { + sha256 = "0mkx23s7zq48hzzzw3vbzsfzfz3rjsiwgf3i00xawcxrjjrgxm9g"; +} (args // { v = "2.4"; }) diff --git a/pkgs/development/tools/build-managers/cmake/2.4.8.nix b/pkgs/development/tools/build-managers/cmake/2.4.8.nix new file mode 100644 index 000000000000..27eb5ea396af --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.4.8.nix @@ -0,0 +1,3 @@ +args: (import ./common.nix) { + sha256 = "1w9i0qrbciym5ahag24xyp1x0qj6awq1cs07hdjflxikyga0f1pj"; +} (args // { v = "2.4"; }) diff --git a/pkgs/development/tools/build-managers/cmake/common.nix b/pkgs/development/tools/build-managers/cmake/common.nix new file mode 100644 index 000000000000..ab1f01bf2d71 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/common.nix @@ -0,0 +1,19 @@ +hash: args: with args; +stdenv.mkDerivation rec { + name = "cmake-" + version; + setupHook = ./setup-hook.sh; + + src = fetchurl ({ + url = "http://www.cmake.org/files/v${v}/${name}.tar.gz"; + } // hash); + + propagatedBuildInputs = [replace]; + + postUnpack = "source ${setupHook}; fixCmakeFiles \${sourceRoot}"; + + postInstall="fixCmakeFiles \$out/share"; + + meta = { + description = "Cross-Platform Makefile Generator"; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix deleted file mode 100644 index 45311ee0e3cc..000000000000 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "cmake-2.4.7"; - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz; - sha256 = "0mkx23s7zq48hzzzw3vbzsfzfz3rjsiwgf3i00xawcxrjjrgxm9g"; - }; - - propagatedBuildInputs = [replace]; - - postUnpack = "source \${setupHook}; fixCmakeFiles \${sourceRoot}"; - - postInstall="fixCmakeFiles \$out/share"; - - meta = { - description = "Cross-Platform Makefile Generator"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d571012f630b..fbfaef10bc87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1525,7 +1525,7 @@ rec { inherit fetchurl stdenv; }; - cmake = import ../development/tools/build-managers/cmake { + cmake = (selectVersion ../development/tools/build-managers/cmake "2.4.8") { inherit fetchurl stdenv replace; }; |