public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cmake32'

Browse Source 
Packages that use CMake and depend on OpenSSL should use CMake 3.2 or later.
This commit is contained in:
Thomas Tuegel
2015-03-21 12:34:48 -05:00
parent f953d77be2 a17535822a
commit 0451646382
4 changed files with 98 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+4
View File
@@ -4913,6 +4913,9 @@ let
ps = if stdenv.isDarwin then darwin.ps else null;
};
cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix {
jsoncpp = jsoncpp-1_6;
};
cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { };
cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
@@ -6074,6 +6077,7 @@ let
json_c = callPackage ../development/libraries/json-c { };
jsoncpp = callPackage ../development/libraries/jsoncpp { };
jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { };
libjson = callPackage ../development/libraries/libjson { };