remove cmake-2.6.4

-153
-59
pkgs/development/tools/build-managers/cmake/264.nix
··· 1 - { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive 2 - , useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c 3 - }: 4 - 5 - with stdenv.lib; 6 - 7 - let 8 - os = stdenv.lib.optionalString; 9 - majorVersion = "2.6"; 10 - minorVersion = "4"; 11 - version = "${majorVersion}.${minorVersion}"; 12 - in 13 - 14 - stdenv.mkDerivation rec { 15 - name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; 16 - 17 - inherit majorVersion; 18 - 19 - src = fetchurl { 20 - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; 21 - sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw"; 22 - }; 23 - 24 - patches = 25 - # Don't search in non-Nix locations such as /usr, but do search in 26 - # Nixpkgs' Glibc. 27 - optional (stdenv ? glibc) ./search-path-264.patch; 28 - 29 - buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ] 30 - ++ optional useNcurses ncurses 31 - ++ optional useQt4 qt4; 32 - 33 - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; 34 - 35 - configureFlags = 36 - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" 37 - + stdenv.lib.optionalString useQt4 " --qt-gui"; 38 - 39 - setupHook = ./setup-hook.sh; 40 - 41 - postPatch = 42 - '' 43 - dontUseCmakeConfigure=1 44 - source $setupHook 45 - fixCmakeFiles . 46 - ''; 47 - 48 - preConfigure = optionalString (stdenv ? glibc) 49 - '' 50 - substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} 51 - ''; 52 - 53 - meta = { 54 - homepage = http://www.cmake.org/; 55 - description = "Cross-Platform Makefile Generator"; 56 - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; 57 - maintainers = [ stdenv.lib.maintainers.urkud ]; 58 - }; 59 - }
···
-93
pkgs/development/tools/build-managers/cmake/search-path-264.patch
··· 1 - diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake 2 - index 4e4c2cb..9784655 100644 3 - --- a/Modules/Platform/Linux.cmake 4 - +++ b/Modules/Platform/Linux.cmake 5 - @@ -43,21 +43,10 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE) 6 - # checking the platform every time. This option is advanced enough 7 - # that only package maintainers should need to adjust it. They are 8 - # capable of providing a setting on the command line. 9 - - IF(EXISTS "/etc/debian_version") 10 - - SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL 11 - - "Install .so files without execute permission.") 12 - - ELSE(EXISTS "/etc/debian_version") 13 - - SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL 14 - - "Install .so files without execute permission.") 15 - - ENDIF(EXISTS "/etc/debian_version") 16 - + SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL 17 - + "Install .so files without execute permission.") 18 - ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) 19 - 20 - INCLUDE(Platform/UnixPaths) 21 - 22 - -# Debian has lib64 paths only for compatibility so they should not be 23 - -# searched. 24 - -IF(EXISTS "/etc/debian_version") 25 - - SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) 26 - -ENDIF(EXISTS "/etc/debian_version") 27 - -# always include the gcc compiler information 28 - INCLUDE(Platform/gcc) 29 - diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake 30 - index 584d334..4fcf951 100755 31 - --- a/Modules/Platform/UnixPaths.cmake 32 - +++ b/Modules/Platform/UnixPaths.cmake 33 - @@ -8,56 +8,18 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) 34 - # List common installation prefixes. These will be used for all 35 - # search types. 36 - LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH 37 - - # Standard 38 - - / /usr /usr/local 39 - - 40 - - # CMake install location 41 - - "${_CMAKE_INSTALL_DIR}" 42 - - 43 - - # Project install destination. 44 - - "${CMAKE_INSTALL_PREFIX}" 45 - - ) 46 - - 47 - -# List common include file locations not under the common prefixes. 48 - -LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH 49 - - # Windows API on Cygwin 50 - - /usr/include/w32api 51 - - 52 - - # X11 53 - - /usr/X11R6/include /usr/include/X11 54 - - 55 - - # Other 56 - - /opt/local/include /usr/pkg/include 57 - - /opt/csw/include /opt/include 58 - - /usr/openwin/include 59 - - ) 60 - - 61 - -LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH 62 - - # Windows API on Cygwin 63 - - /usr/lib/w32api 64 - - 65 - - # X11 66 - - /usr/X11R6/lib /usr/lib/X11 67 - - 68 - - # Other 69 - - /opt/local/lib /usr/pkg/lib 70 - - /opt/csw/lib /opt/lib 71 - - /usr/openwin/lib 72 - - ) 73 - - 74 - -LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH 75 - - /usr/pkg/bin 76 - + "@glibc@" 77 - ) 78 - 79 - LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 80 - - /lib /usr/lib /usr/lib32 /usr/lib64 81 - + "@glibc@/lib" 82 - ) 83 - 84 - LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES 85 - - /usr/include 86 - + "@glibc@/include" 87 - ) 88 - LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES 89 - - /usr/include 90 - + "@glibc@/include" 91 - ) 92 - 93 - # Enable use of lib64 search path variants by default.
···
-1
pkgs/top-level/all-packages.nix
··· 4914 jsoncpp = jsoncpp-1_6; 4915 }; 4916 cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; 4917 - cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; 4918 4919 cmakeCurses = cmake.override { useNcurses = true; }; 4920
··· 4914 jsoncpp = jsoncpp-1_6; 4915 }; 4916 cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; 4917 4918 cmakeCurses = cmake.override { useNcurses = true; }; 4919