ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 10:07:42 +03:00
Code Issues Projects Releases Wiki Activity

cmake: 3.11.2 -> 3.12.1

Browse Source
This commit is contained in:
Andrew Childs 2018-08-12 02:28:51 +09:00
parent 98df4f6351
commit 32cc3eb899
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/tools/build-managers/cmake/application-services-3.12.patch Normal file
View File

@ -0,0 +1,15 @@
diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx
--- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx 2018-08-09 21:14:08.000000000 +0900
+++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx 2018-08-12 02:47:28.719691934 +0900
@@ -35,11 +35,6 @@
struct cmLinkImplementation;
-#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__)
-# define HAVE_APPLICATION_SERVICES
-# include <ApplicationServices/ApplicationServices.h>
-#endif
-
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmXMLParser.h"

7
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig { stdenv, fetchurl, fetchpatch, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, majorVersion ? "3.11" , majorVersion ? "3.12"
# darwin attributes # darwin attributes
, ps , ps
, isBootstrap ? false , isBootstrap ? false
@ -17,6 +17,10 @@ with stdenv.lib;
with ( with (
{ {
"3.12" = {
minorVersion = "1";
sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5";
};
"3.11" = { "3.11" = {
minorVersion = "2"; minorVersion = "2";
sha256 = "0j2jpx94lnqx5w59i9xihl56hf6ghk04438rqhh7lk1bryxj5g2y"; sha256 = "0j2jpx94lnqx5w59i9xihl56hf6ghk04438rqhh7lk1bryxj5g2y";
@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
}) })
# Don't depend on frameworks. # Don't depend on frameworks.
++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional
++ optional (useSharedLibraries && majorVersion == "3.12") ./application-services-3.12.patch
++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ]; outputs = [ "out" ];