From 32cc3eb899e348a3178840e61280c6c328f78f10 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 12 Aug 2018 02:28:51 +0900 Subject: [PATCH] cmake: 3.11.2 -> 3.12.1 --- .../cmake/application-services-3.12.patch | 15 +++++++++++++++ .../tools/build-managers/cmake/default.nix | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/build-managers/cmake/application-services-3.12.patch diff --git a/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch b/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch new file mode 100644 index 000000000000..c83f56ae5720 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch @@ -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 +-#endif +- + #if defined(CMAKE_BUILD_WITH_CMAKE) + # include "cmXMLParser.h" + diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ed0928febe29..9836aec1bff3 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash -, majorVersion ? "3.11" +, majorVersion ? "3.12" # darwin attributes , ps , isBootstrap ? false @@ -17,6 +17,10 @@ with stdenv.lib; with ( { + "3.12" = { + minorVersion = "1"; + sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5"; + }; "3.11" = { minorVersion = "2"; sha256 = "0j2jpx94lnqx5w59i9xihl56hf6ghk04438rqhh7lk1bryxj5g2y"; @@ -64,6 +68,7 @@ stdenv.mkDerivation rec { }) # Don't depend on frameworks. ++ 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; outputs = [ "out" ];