remove cmake-2.8

-175
-73
pkgs/development/tools/build-managers/cmake/2.8.nix
··· 1 - { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive 2 - , useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null 3 - }: 4 - 5 - with stdenv.lib; 6 - 7 - assert wantPS -> (ps != null); 8 - 9 - let 10 - os = stdenv.lib.optionalString; 11 - majorVersion = "2.8"; 12 - minorVersion = "12.2"; 13 - version = "${majorVersion}.${minorVersion}"; 14 - in 15 - 16 - stdenv.mkDerivation rec { 17 - name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; 18 - 19 - inherit majorVersion; 20 - 21 - src = fetchurl { 22 - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; 23 - sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; 24 - }; 25 - 26 - enableParallelBuilding = true; 27 - 28 - patches = 29 - [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 30 - name = "FindFreetype-2.5.patch"; 31 - url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; 32 - sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; 33 - })] ++ 34 - # Don't search in non-Nix locations such as /usr, but do search in 35 - # Nixpkgs' Glibc. 36 - optional (stdenv ? glibc) ./search-path.patch ++ 37 - optional (stdenv ? cross) (fetchurl { 38 - name = "fix-darwin-cross-compile.patch"; 39 - url = "http://public.kitware.com/Bug/file_download.php?" 40 - + "file_id=4981&type=bug"; 41 - sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; 42 - }); 43 - 44 - buildInputs = [ curl expat zlib bzip2 libarchive ] 45 - ++ optional useNcurses ncurses 46 - ++ optional useQt4 qt4; 47 - 48 - propagatedBuildInputs = optional wantPS ps; 49 - 50 - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; 51 - 52 - configureFlags = 53 - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" 54 - + stdenv.lib.optionalString useQt4 " --qt-gui"; 55 - 56 - setupHook = ./setup-hook.sh; 57 - 58 - dontUseCmakeConfigure = true; 59 - 60 - preConfigure = optionalString (stdenv ? glibc) 61 - '' 62 - source $setupHook 63 - fixCmakeFiles . 64 - substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} 65 - ''; 66 - 67 - meta = { 68 - homepage = http://www.cmake.org/; 69 - description = "Cross-Platform Makefile Generator"; 70 - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; 71 - maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; 72 - }; 73 - }
-97
pkgs/development/tools/build-managers/cmake/search-path.patch
··· 1 - diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake 2 - index fe8e003..378512c 100644 3 - --- a/Modules/Platform/Linux.cmake 4 - +++ b/Modules/Platform/Linux.cmake 5 - @@ -36,13 +36,13 @@ else() 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() 13 - + # if(EXISTS "/etc/debian_version") 14 - + # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL 15 - + # "Install .so files without execute permission.") 16 - + # else() 17 - set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL 18 - "Install .so files without execute permission.") 19 - - endif() 20 - + # endif() 21 - endif() 22 - 23 - # Match multiarch library directory names. 24 - @@ -52,6 +52,6 @@ include(Platform/UnixPaths) 25 - 26 - # Debian has lib64 paths only for compatibility so they should not be 27 - # searched. 28 - -if(EXISTS "/etc/debian_version") 29 - - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) 30 - -endif() 31 - +# if(EXISTS "/etc/debian_version") 32 - +# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) 33 - +#endif() 34 - diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake 35 - index ccb2663..39834e6 100644 36 - --- a/Modules/Platform/UnixPaths.cmake 37 - +++ b/Modules/Platform/UnixPaths.cmake 38 - @@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) 39 - # search types. 40 - list(APPEND CMAKE_SYSTEM_PREFIX_PATH 41 - # Standard 42 - - /usr/local /usr / 43 - - 44 - - # CMake install location 45 - - "${_CMAKE_INSTALL_DIR}" 46 - - 47 - - # Project install destination. 48 - - "${CMAKE_INSTALL_PREFIX}" 49 - - ) 50 - - 51 - -# List common include file locations not under the common prefixes. 52 - -list(APPEND CMAKE_SYSTEM_INCLUDE_PATH 53 - - # Windows API on Cygwin 54 - - /usr/include/w32api 55 - - 56 - - # X11 57 - - /usr/X11R6/include /usr/include/X11 58 - - 59 - - # Other 60 - - /usr/pkg/include 61 - - /opt/csw/include /opt/include 62 - - /usr/openwin/include 63 - - ) 64 - - 65 - -list(APPEND CMAKE_SYSTEM_LIBRARY_PATH 66 - - # Windows API on Cygwin 67 - - /usr/lib/w32api 68 - - 69 - - # X11 70 - - /usr/X11R6/lib /usr/lib/X11 71 - - 72 - - # Other 73 - - /usr/pkg/lib 74 - - /opt/csw/lib /opt/lib 75 - - /usr/openwin/lib 76 - - ) 77 - - 78 - -list(APPEND CMAKE_SYSTEM_PROGRAM_PATH 79 - - /usr/pkg/bin 80 - + "@glibc@" 81 - ) 82 - 83 - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 84 - - /lib /usr/lib /usr/lib32 /usr/lib64 85 - + "@glibc@/lib" 86 - ) 87 - 88 - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES 89 - - /usr/include 90 - + "@glibc@/include" 91 - ) 92 - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES 93 - - /usr/include 94 - + "@glibc@/include" 95 - ) 96 - 97 - # Enable use of lib64 search path variants by default.
-5
pkgs/top-level/all-packages.nix
··· 4910 4910 4911 4911 ctodo = callPackage ../applications/misc/ctodo { }; 4912 4912 4913 - cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { 4914 - wantPS = stdenv.isDarwin; 4915 - ps = if stdenv.isDarwin then darwin.ps else null; 4916 - }; 4917 - 4918 4913 cmake = callPackage ../development/tools/build-managers/cmake { 4919 4914 jsoncpp = jsoncpp-1_6; 4920 4915 };