tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
remove cmake-3.0
Thomas Tuegel
11 years ago
f47af9b2
36283701
+1
-88
5 changed files
expand all
collapse all
unified
split
pkgs
development
tools
build-managers
cmake
3.0.nix
762-13887.patch
default.nix
search-path-3.2.patch
top-level
all-packages.nix
-69
pkgs/development/tools/build-managers/cmake/3.0.nix
···
1
-
{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
2
-
, useNcurses ? false, ncurses, useQt4 ? false, qt4
3
-
}:
4
-
5
-
with stdenv.lib;
6
-
7
-
let
8
-
os = stdenv.lib.optionalString;
9
-
majorVersion = "3.0";
10
-
minorVersion = "2";
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 = "0gk90mw7f93sgkrsrxqy2b6fm5j43yfw50xkrk0bxndvmlgackkb";
22
-
};
23
-
24
-
enableParallelBuilding = true;
25
-
26
-
patches =
27
-
[(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
28
-
name = "FindFreetype-2.5.patch";
29
-
url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
30
-
sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
31
-
})] ++
32
-
# Don't search in non-Nix locations such as /usr, but do search in
33
-
# Nixpkgs' Glibc.
34
-
optional (stdenv ? glibc) ./search-path-3.0.patch ++
35
-
optional (stdenv ? cross) (fetchurl {
36
-
name = "fix-darwin-cross-compile.patch";
37
-
url = "http://public.kitware.com/Bug/file_download.php?"
38
-
+ "file_id=4981&type=bug";
39
-
sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
40
-
});
41
-
42
-
buildInputs = [ curl expat zlib bzip2 libarchive ]
43
-
++ optional useNcurses ncurses
44
-
++ optional useQt4 qt4;
45
-
46
-
CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
47
-
48
-
configureFlags =
49
-
"--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
50
-
+ stdenv.lib.optionalString useQt4 " --qt-gui";
51
-
52
-
setupHook = ./setup-hook.sh;
53
-
54
-
dontUseCmakeConfigure = true;
55
-
56
-
preConfigure = optionalString (stdenv ? glibc)
57
-
''
58
-
source $setupHook
59
-
fixCmakeFiles .
60
-
substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
61
-
'';
62
-
63
-
meta = {
64
-
homepage = http://www.cmake.org/;
65
-
description = "Cross-Platform Makefile Generator";
66
-
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
67
-
maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
68
-
};
69
-
}
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
-17
pkgs/development/tools/build-managers/cmake/762-13887.patch
···
1
-
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
2
-
index e7491bb..57b4348 100644
3
-
--- a/Source/CTest/cmCTestTestHandler.cxx
4
-
+++ b/Source/CTest/cmCTestTestHandler.cxx
5
-
@@ -1303,10 +1303,9 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec)
6
-
for ( it = vec.begin(); it != vec.end(); ++it )
7
-
{
8
-
int retVal = 0;
9
-
- std::string cmd = cmSystemTools::ConvertToOutputPath(it->c_str());
10
-
- cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << cmd
11
-
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
12
-
<< std::endl);
13
-
- if ( !cmSystemTools::RunSingleCommand(cmd.c_str(), 0, &retVal, 0,
14
-
+ if ( !cmSystemTools::RunSingleCommand((*it).c_str(), 0, &retVal, 0,
15
-
cmSystemTools::OUTPUT_MERGE
16
-
/*this->Verbose*/) || retVal != 0 )
17
-
{
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
+1
-1
pkgs/development/tools/build-managers/cmake/default.nix
···
27
patches =
28
# Don't search in non-Nix locations such as /usr, but do search in
29
# Nixpkgs' Glibc.
30
-
optional (stdenv ? glibc) ./search-path-3.0.patch ++
31
optional (stdenv ? cross) (fetchurl {
32
name = "fix-darwin-cross-compile.patch";
33
url = "http://public.kitware.com/Bug/file_download.php?"
···
27
patches =
28
# Don't search in non-Nix locations such as /usr, but do search in
29
# Nixpkgs' Glibc.
30
+
optional (stdenv ? glibc) ./search-path-3.2.patch ++
31
optional (stdenv ? cross) (fetchurl {
32
name = "fix-darwin-cross-compile.patch";
33
url = "http://public.kitware.com/Bug/file_download.php?"
pkgs/development/tools/build-managers/cmake/search-path-3.0.patch
pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
-1
pkgs/top-level/all-packages.nix
···
4913
cmake = callPackage ../development/tools/build-managers/cmake {
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
···
4913
cmake = callPackage ../development/tools/build-managers/cmake {
4914
jsoncpp = jsoncpp-1_6;
4915
};
0
4916
4917
cmakeCurses = cmake.override { useNcurses = true; };
4918