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

darwin.cf-private: include headers from osx_private_sdk

Browse Source 
This includes things like CFURLGetFSRef which are not part of the
swift-corelibs CoreFoundation.
This commit is contained in:
Daiderd Jordan
2018-10-24 12:04:05 +02:00
parent 6d746f7d4a
commit 0fcd2ca7b2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/darwin/cf-private/default.nix
+9 -7
View File
@@ -1,4 +1,4 @@
{ CF, apple_sdk }: { CF, apple_sdk, osx_private_sdk }:
# cf-private is a bit weird, but boils down to CF with a weird setup-hook that # cf-private is a bit weird, but boils down to CF with a weird setup-hook that
# makes a build link against the system CoreFoundation rather than our pure one. # makes a build link against the system CoreFoundation rather than our pure one.
@@ -13,10 +13,10 @@
# because of their magic "toll-free bridging" support, the symbols for those types # because of their magic "toll-free bridging" support, the symbols for those types
# live in CoreFoundation with an ObjC runtime. And because that isn't public, we have # live in CoreFoundation with an ObjC runtime. And because that isn't public, we have
# this hack in place to let people link properly anyway. Phew! # this hack in place to let people link properly anyway. Phew!
# #
# This can be revisited if Apple ever decide to release the ObjC backend in a publicly # This can be revisited if Apple ever decide to release the ObjC backend in a publicly
# buildable form. # buildable form.
# #
# This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to # This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to
# an existing package was annoying. We need a buildEnv that knows how to add those # an existing package was annoying. We need a buildEnv that knows how to add those
CF.overrideAttrs (orig: { CF.overrideAttrs (orig: {
@@ -38,22 +38,24 @@ CF.overrideAttrs (orig: {
# this is watchman, who can almost certainly switch to the pure CF once the header # this is watchman, who can almost certainly switch to the pure CF once the header
# and functionality is merged in. # and functionality is merged in.
installPhase = orig.installPhase + '' installPhase = orig.installPhase + ''
# Copy or overwrite private headers, some of these might already
# exist in CF but the private versions have more information.
basepath="Library/Frameworks/CoreFoundation.framework/Headers" basepath="Library/Frameworks/CoreFoundation.framework/Headers"
path="$basepath/CFFileDescriptor.h" cp -Lfv --no-preserve mode ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* "$out/$basepath"
# Append the include at top level or nobody will notice the header we're about to add # Append the include at top level or nobody will notice the header we're about to add
sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \ sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \
"$out/$basepath/CoreFoundation.h" "$out/$basepath/CoreFoundation.h"
cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path cp ${apple_sdk.frameworks.CoreFoundation}/$basepath/CFFileDescriptor.h $out/$basepath/CFFileDescriptor.h
'' + '' +
# This one is less likely to go away, but I'll mention it anyway. The issue is at # This one is less likely to go away, but I'll mention it anyway. The issue is at
# https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase
'' ''
path="$basepath/CFURLEnumerator.h" path="$basepath/CFURLEnumerator.h"
sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFURLEnumerator.h>' \ sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFURLEnumerator.h>' \
"$out/$basepath/CoreFoundation.h" "$out/$basepath/CoreFoundation.h"
cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
''; '';
}) })
pkgs/top-level/darwin-packages.nix
+4 -2
View File
@@ -31,7 +31,9 @@ in
libcxxabi = pkgs.libcxxabi; libcxxabi = pkgs.libcxxabi;
}; };
cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; }; cf-private = callPackage ../os-specific/darwin/cf-private {
inherit (darwin) CF apple_sdk osx_private_sdk;
};
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
@@ -74,7 +76,7 @@ in
CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; }; CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; };
# As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in
# libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; };