From dc483505d4ff21976173c96dba1429dee7121ff0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 5 Mar 2019 13:22:05 -0500
Subject: [PATCH] =?UTF-8?q?cf-private:=20don=E2=80=99t=20use=20private=20s?=
 =?UTF-8?q?dk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no private sdk is available for 10.12.
---
 .../os-specific/darwin/cf-private/default.nix |  5 +---
 .../darwin/osx-private-sdk/default.nix        | 27 -------------------
 pkgs/top-level/darwin-packages.nix            |  4 +--
 pkgs/top-level/release.nix                    |  1 -
 4 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/osx-private-sdk/default.nix

diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix
index dc1b0112a219..eb5f651a1a08 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/pkgs/os-specific/darwin/cf-private/default.nix
@@ -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>' \
diff --git a/pkgs/os-specific/darwin/osx-private-sdk/default.nix b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
deleted file mode 100644
index 115512a6febd..000000000000
--- a/pkgs/os-specific/darwin/osx-private-sdk/default.nix
+++ /dev/null
@@ -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
-  '';
-}
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 2a82af19fa2b..1753ac9dc7a6 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -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 { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 6c2159f9befd..d18c1dbd2e7f 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -193,7 +193,6 @@ let
 
       darwin = packagePlatforms pkgs.darwin // {
         cf-private = {};
-        osx_private_sdk = {};
         xcode = {};
       };
     } ));