cf-private: don’t use private sdk

no private sdk is available for 10.12.
This commit is contained in:
Matthew Bauer 2019-03-05 13:22:05 -05:00
parent 5428db7c7c
commit dc483505d4
4 changed files with 2 additions and 35 deletions

View file

@ -1,4 +1,4 @@
{ CF, apple_sdk, osx_private_sdk }:
{ CF, apple_sdk }:
# 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.
@ -38,10 +38,7 @@ CF.overrideAttrs (orig: {
# this is watchman, who can almost certainly switch to the pure CF once the header
# and functionality is merged in.
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"
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
sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \

View file

@ -1,27 +0,0 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "OSXPrivateSDK";
src = fetchFromGitHub {
owner = "samdmarshall";
repo = "OSXPrivateSDK";
rev = "f4d52b60e86b496abfaffa119a7d299562d99783";
sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh";
};
# NOTE: we install only headers that are really needed to keep closure size
# reasonable.
installPhase = ''
mkdir -p $out/include
sdk10=PrivateSDK10.10.sparse.sdk
sdk=PrivateSDK10.9.sparse.sdk
cp $sdk/usr/local/include/sandbox_private.h $out/include/sandbox_private.h
# this can be removed once we dtrace binary
cp $sdk/usr/local/include/security_utilities/utilities_dtrace.h $out/include/utilities_dtrace.h
cp -RL $sdk/usr/include/xpc $out/include/xpc
cp -RL $sdk/usr/local/include/bsm $out/include/bsm
cp -RL $sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders $out/include/SecurityPrivateHeaders
cp -RL $sdk10/System/Library/Frameworks/CoreFoundation.framework/Headers $out/include/CoreFoundationPrivateHeaders
'';
}

View file

@ -33,7 +33,7 @@ in
};
cf-private = callPackage ../os-specific/darwin/cf-private {
inherit (darwin) CF apple_sdk osx_private_sdk;
inherit (darwin) CF apple_sdk;
};
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
@ -59,8 +59,6 @@ in
opencflite = callPackage ../os-specific/darwin/opencflite { };
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { };
stubs = callPackages ../os-specific/darwin/stubs { };
trash = darwin.callPackage ../os-specific/darwin/trash { };

View file

@ -193,7 +193,6 @@ let
darwin = packagePlatforms pkgs.darwin // {
cf-private = {};
osx_private_sdk = {};
xcode = {};
};
} ));