diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-22 17:02:32 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-22 17:02:32 -0500 |
commit | 3628370127fb327d4559cd319360687922d74fc5 (patch) | |
tree | e5eb7263b1bb27be84349f26e6ed27856a0a62cd /pkgs/development/tools/build-managers/cmake | |
parent | 67199bda4effafecb977a44c623c2115032dc347 (diff) | |
download | nixlib-3628370127fb327d4559cd319360687922d74fc5.tar nixlib-3628370127fb327d4559cd319360687922d74fc5.tar.gz nixlib-3628370127fb327d4559cd319360687922d74fc5.tar.bz2 nixlib-3628370127fb327d4559cd319360687922d74fc5.tar.lz nixlib-3628370127fb327d4559cd319360687922d74fc5.tar.xz nixlib-3628370127fb327d4559cd319360687922d74fc5.tar.zst nixlib-3628370127fb327d4559cd319360687922d74fc5.zip |
remove cmake-2.6.4
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake')
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/264.nix | 59 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/search-path-264.patch | 93 |
2 files changed, 0 insertions, 152 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix deleted file mode 100644 index b2695c2ec87c..000000000000 --- a/pkgs/development/tools/build-managers/cmake/264.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive -, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c -}: - -with stdenv.lib; - -let - os = stdenv.lib.optionalString; - majorVersion = "2.6"; - minorVersion = "4"; - 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 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw"; - }; - - patches = - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path-264.patch; - - buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ] - ++ 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; - - postPatch = - '' - dontUseCmakeConfigure=1 - source $setupHook - fixCmakeFiles . - ''; - - 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/development/tools/build-managers/cmake/search-path-264.patch b/pkgs/development/tools/build-managers/cmake/search-path-264.patch deleted file mode 100644 index 97ad6f119d8b..000000000000 --- a/pkgs/development/tools/build-managers/cmake/search-path-264.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake -index 4e4c2cb..9784655 100644 ---- a/Modules/Platform/Linux.cmake -+++ b/Modules/Platform/Linux.cmake -@@ -43,21 +43,10 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE) - # 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(EXISTS "/etc/debian_version") -- SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -- "Install .so files without execute permission.") -- ENDIF(EXISTS "/etc/debian_version") -+ SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -+ "Install .so files without execute permission.") - ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) - - 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(EXISTS "/etc/debian_version") --# always include the gcc compiler information - INCLUDE(Platform/gcc) -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 584d334..4fcf951 100755 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -8,56 +8,18 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # List common installation prefixes. These will be used for all - # search types. - LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Standard -- / /usr /usr/local -- -- # 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 -- /opt/local/include /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 -- /opt/local/lib /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. |