diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-06 14:35:30 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-06 14:35:30 +0000 |
commit | 614d81046c893166ed07664b9640a3ef68d648ca (patch) | |
tree | 884763bdd249ffb656c9df525f19bd8817ec6849 /pkgs | |
parent | b49ee92aa9abc945be08ba7858d5c738d0da7bf3 (diff) |
Remove cmake_2_8_7: default is already 2.8.7
svn path=/nixpkgs/trunk/; revision=32827
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/2.8.7.nix | 61 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 0 insertions, 65 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.7.nix b/pkgs/development/tools/build-managers/cmake/2.8.7.nix deleted file mode 100644 index c440285671be7..0000000000000 --- a/pkgs/development/tools/build-managers/cmake/2.8.7.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive -, useNcurses ? false, ncurses, useQt4 ? false, qt4 -, darwinInstallNameToolUtility }: - -with stdenv.lib; - -let - os = stdenv.lib.optionalString; - majorVersion = "2.8"; - minorVersion = "7"; - version = "${majorVersion}.${minorVersion}"; -in - -# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux -stdenv.mkDerivation rec { - name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; - - inherit majorVersion; - - src = fetchurl { - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f"; - }; - - patches = - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path.patch; - - buildInputs = [ curl expat zlib bzip2 libarchive ] - ++ optional stdenv.isDarwin darwinInstallNameToolUtility - ++ optional useNcurses ncurses - ++ optional useQt4 qt4; - - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; - - configureFlags = - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" - + stdenv.lib.optionalString useQt4 " --qt-gui"; - - setupHook = ./setup-hook.sh; - - postUnpack = - '' - dontUseCmakeConfigure=1 - source $setupHook - fixCmakeFiles $sourceRoot - ''; - - preConfigure = optionalString (stdenv ? glibc) - '' - substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} - ''; - - meta = { - homepage = http://www.cmake.org/; - description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972855ee232ef..968733e8257d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2943,10 +2943,6 @@ let cmake = callPackage ../development/tools/build-managers/cmake { }; - cmake_2_8_7 = callPackage ../development/tools/build-managers/cmake/2.8.7.nix { - zlib = zlib_latest; - }; - cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; cmakeCurses = cmake.override { useNcurses = true; }; |