From 67199bda4effafecb977a44c623c2115032dc347 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 22 Mar 2015 17:01:45 -0500 Subject: [PATCH] remove cmake-2.8 --- .../tools/build-managers/cmake/2.8.nix | 73 -------------- .../build-managers/cmake/search-path.patch | 97 ------------------- pkgs/top-level/all-packages.nix | 5 - 3 files changed, 175 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/cmake/2.8.nix delete mode 100644 pkgs/development/tools/build-managers/cmake/search-path.patch diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix deleted file mode 100644 index 60a941a6637..00000000000 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive -, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null -}: - -with stdenv.lib; - -assert wantPS -> (ps != null); - -let - os = stdenv.lib.optionalString; - majorVersion = "2.8"; - minorVersion = "12.2"; - version = "${majorVersion}.${minorVersion}"; -in - -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 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; - }; - - enableParallelBuilding = true; - - patches = - [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 - name = "FindFreetype-2.5.patch"; - url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; - sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; - })] ++ - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path.patch ++ - optional (stdenv ? cross) (fetchurl { - name = "fix-darwin-cross-compile.patch"; - url = "http://public.kitware.com/Bug/file_download.php?" - + "file_id=4981&type=bug"; - sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); - - buildInputs = [ curl expat zlib bzip2 libarchive ] - ++ optional useNcurses ncurses - ++ optional useQt4 qt4; - - propagatedBuildInputs = optional wantPS ps; - - 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; - - dontUseCmakeConfigure = true; - - preConfigure = optionalString (stdenv ? glibc) - '' - source $setupHook - fixCmakeFiles . - 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 = with stdenv.lib.maintainers; [ urkud mornfall ]; - }; -} diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch deleted file mode 100644 index 31c85d6f522..00000000000 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake -index fe8e003..378512c 100644 ---- a/Modules/Platform/Linux.cmake -+++ b/Modules/Platform/Linux.cmake -@@ -36,13 +36,13 @@ else() - # checking the platform every time. This option is advanced enough - # that only package maintainers should need to adjust it. They are - # capable of providing a setting on the command line. -- if(EXISTS "/etc/debian_version") -- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL -- "Install .so files without execute permission.") -- else() -+ # if(EXISTS "/etc/debian_version") -+ # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL -+ # "Install .so files without execute permission.") -+ # else() - set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL - "Install .so files without execute permission.") -- endif() -+ # endif() - endif() - - # Match multiarch library directory names. -@@ -52,6 +52,6 @@ include(Platform/UnixPaths) - - # Debian has lib64 paths only for compatibility so they should not be - # searched. --if(EXISTS "/etc/debian_version") -- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) --endif() -+# if(EXISTS "/etc/debian_version") -+# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) -+#endif() -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index ccb2663..39834e6 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -- /usr/local /usr / -- -- # CMake install location -- "${_CMAKE_INSTALL_DIR}" -- -- # Project install destination. -- "${CMAKE_INSTALL_PREFIX}" -- ) -- --# List common include file locations not under the common prefixes. --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -- ) -- --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -- ) -- --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ "@glibc@" - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /usr/lib /usr/lib32 /usr/lib64 -+ "@glibc@/lib" - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ "@glibc@/include" - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ "@glibc@/include" - ) - - # Enable use of lib64 search path variants by default. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90f0ad80c39..e1648dd9021 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4910,11 +4910,6 @@ let ctodo = callPackage ../applications/misc/ctodo { }; - cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { - wantPS = stdenv.isDarwin; - ps = if stdenv.isDarwin then darwin.ps else null; - }; - cmake = callPackage ../development/tools/build-managers/cmake { jsoncpp = jsoncpp-1_6; };