b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cmake: fix build on darwin

Browse source 
Fixes missing CoreFoundation declarations since bump to 3.19.3,
e.g. `error: unknown type name 'CFUUIDRef'`

ApplicationServices.h transitively includes CoreFoundation.h, but as we
patch ApplicationServices out of CMake, the CF symbols were not visible.
Previously this was not a concern, as they were not needed until
d250b67722
This commit is contained in:
Ryan Burns 2021-01-23 16:49:22 -08:00 committed by Frederik Rietdijk
parent a2994c588a
commit a761d5ed1b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/tools/build-managers/cmake/application-services.patch
View file

@ -14,15 +14,16 @@ diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.c
index a5ce5d18f4..3d6838ce82 100644 index a5ce5d18f4..3d6838ce82 100644
--- a/Source/cmGlobalXCodeGenerator.cxx --- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -43,11 +43,6 @@ @@ -43,11 +43,10 @@
struct cmLinkImplementation; struct cmLinkImplementation;
-#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
-# define HAVE_APPLICATION_SERVICES -# define HAVE_APPLICATION_SERVICES
-# include <ApplicationServices/ApplicationServices.h> -# include <ApplicationServices/ApplicationServices.h>
-#endif +# include <CoreFoundation/CoreFoundation.h>
- #endif
#if !defined(CMAKE_BOOTSTRAP) #if !defined(CMAKE_BOOTSTRAP)
# include "cmXMLParser.h" # include "cmXMLParser.h"