diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-11-09 18:31:46 +0300 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-11-09 18:31:46 +0300 |
commit | ffbd1d011b432d76741900fe28ccbc873d31bbeb (patch) | |
tree | c1f2b206c01a25c001364a3050f7fa2fbddc5fc9 /pkgs/development/tools/build-managers/cmake | |
parent | 0fb2c3e85a1161fa3232ead33192176cd5859484 (diff) | |
download | nixlib-ffbd1d011b432d76741900fe28ccbc873d31bbeb.tar nixlib-ffbd1d011b432d76741900fe28ccbc873d31bbeb.tar.gz nixlib-ffbd1d011b432d76741900fe28ccbc873d31bbeb.tar.bz2 nixlib-ffbd1d011b432d76741900fe28ccbc873d31bbeb.tar.lz nixlib-ffbd1d011b432d76741900fe28ccbc873d31bbeb.tar.xz nixlib-ffbd1d011b432d76741900fe28ccbc873d31bbeb.tar.zst nixlib-ffbd1d011b432d76741900fe28ccbc873d31bbeb.zip |
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake')
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/3.0.nix | 69 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/search-path-3.0.patch | 74 |
2 files changed, 143 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/3.0.nix b/pkgs/development/tools/build-managers/cmake/3.0.nix new file mode 100644 index 000000000000..f4c368c46647 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/3.0.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4 +}: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "3.0"; + minorVersion = "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 = "0gk90mw7f93sgkrsrxqy2b6fm5j43yfw50xkrk0bxndvmlgackkb"; + }; + + 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-3.0.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; + + 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-3.0.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.0.patch new file mode 100644 index 000000000000..b0447e706071 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.0.patch @@ -0,0 +1,74 @@ +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index 20ee1d1..39834e6 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,64 +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}" +- ) +-if (NOT CMAKE_FIND_NO_INSTALL_PREFIX) +- list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # Project install destination. +- "${CMAKE_INSTALL_PREFIX}" +- ) +- if(CMAKE_STAGING_PREFIX) +- list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # User-supplied staging prefix. +- "${CMAKE_STAGING_PREFIX}" +- ) +- endif() +-endif() +- +-# 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 /lib32 /lib64 /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. + |