diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-02-21 19:38:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 19:38:25 +0100 |
| commit | e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe (patch) | |
| tree | 9f1c308f93c2010308250b9d2ad2991f5081d8b6 /pkgs/development/tools/build-managers | |
| parent | edc41c358919062f6e33e71abef75947a2afb90f (diff) | |
| parent | 4bad7d67cd3c5b7b67c2609a6892d45a2b141f19 (diff) | |
| download | nixlib-e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe.tar nixlib-e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe.tar.gz nixlib-e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe.tar.bz2 nixlib-e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe.tar.lz nixlib-e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe.tar.xz nixlib-e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe.tar.zst nixlib-e0fc181f5cc8b79085db79c77a8bd5290dcfa0fe.zip | |
Merge pull request #80645 from xfix/cmake_2_8-fix-build
cmake_2_8: fix build
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/2.8.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index ac438080b9ab..88ebc5ebfaed 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --replace '"-framework CoreServices"' '""' ''; - buildInputs = [ curl expat zlib bzip2 ] + buildInputs = [ setupHook curl expat zlib bzip2 ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; preConfigure = with stdenv; '' - source $setupHook fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ --subst-var-by libc_bin ${getBin cc.libc} \ @@ -82,7 +81,7 @@ stdenv.mkDerivation rec { homepage = https://cmake.org; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ xfix ]; license = stdenv.lib.licenses.bsd3; }; } |