From c4f18901b425a9ffc8a4367666bc454a95bf1f4c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 30 Aug 2017 22:44:42 +0200
Subject: [PATCH 1/2] darwin: move definition to separate file

---
 pkgs/top-level/all-packages.nix    | 49 ++-------------------------
 pkgs/top-level/darwin-packages.nix | 54 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/top-level/darwin-packages.nix

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a13b896db199..e1f96698e2a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11837,53 +11837,8 @@ with pkgs;
 
   crda = callPackage ../os-specific/linux/crda { };
 
-  darwin = let
-    apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
-  in (apple-source-releases // rec {
-    cctools = callPackage ../os-specific/darwin/cctools/port.nix {
-      inherit libobjc;
-      stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
-      inherit maloader;
-      xctoolchain = xcode.toolchain;
-    };
-
-    cf-private = callPackage ../os-specific/darwin/cf-private {
-      inherit (apple-source-releases) CF;
-      inherit osx_private_sdk;
-    };
-
-    maloader = callPackage ../os-specific/darwin/maloader {
-      inherit opencflite;
-    };
-
-    opencflite = callPackage ../os-specific/darwin/opencflite {};
-
-    swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation {};
-
-    ios-cross = callPackage ../os-specific/darwin/ios-cross {
-      inherit (darwin) binutils;
-    };
-
-    xcode = callPackage ../os-specific/darwin/xcode {};
-
-    osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
-
-    security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
-      Security-framework = darwin.apple_sdk.frameworks.Security;
-    };
-
-    binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
-
-    apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
-
-    libobjc = apple-source-releases.objc4;
-
-    stubs = callPackages ../os-specific/darwin/stubs {};
-
-    usr-include = callPackage ../os-specific/darwin/usr-include {};
-
-    DarwinTools = callPackage ../os-specific/darwin/DarwinTools {};
-  });
+  # Darwin package set
+  darwin = callPackages ./darwin-packages.nix { };
 
   devicemapper = lvm2;
 
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
new file mode 100644
index 000000000000..4fa86a3a1210
--- /dev/null
+++ b/pkgs/top-level/darwin-packages.nix
@@ -0,0 +1,54 @@
+{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }:
+
+let
+  apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
+in
+
+(apple-source-releases // {
+
+  apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
+
+  binutils = callPackage ../os-specific/darwin/binutils {
+    inherit (darwin) cctools;
+  };
+
+  cctools = callPackage ../os-specific/darwin/cctools/port.nix {
+    inherit (darwin) libobjc maloader;
+    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
+    xctoolchain = darwin.xcode.toolchain;
+  };
+
+  cf-private = callPackage ../os-specific/darwin/cf-private {
+    inherit (apple-source-releases) CF;
+    inherit (darwin) osx_private_sdk;
+  };
+
+  DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
+
+  maloader = callPackage ../os-specific/darwin/maloader {
+    inherit (darwin) opencflite;
+  };
+
+  ios-cross = callPackage ../os-specific/darwin/ios-cross {
+    inherit (darwin) binutils;
+  };
+
+  libobjc = apple-source-releases.objc4;
+
+  opencflite = callPackage ../os-specific/darwin/opencflite { };
+
+  osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { };
+
+  security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
+    Security-framework = darwin.apple_sdk.frameworks.Security;
+  };
+
+  stubs = callPackages ../os-specific/darwin/stubs { };
+
+  swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { };
+
+  usr-include = callPackage ../os-specific/darwin/usr-include { };
+
+  xcode = callPackage ../os-specific/darwin/xcode { };
+
+})

From 3979f48f7fdd11af4946488449340f8d50bba079 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 30 Aug 2017 22:48:33 +0200
Subject: [PATCH 2/2] darwin: add callPackage

---
 pkgs/top-level/darwin-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 4fa86a3a1210..32d540a8f967 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -6,6 +6,8 @@ in
 
 (apple-source-releases // {
 
+  callPackage = newScope (darwin.apple_sdk.frameworks // darwin);
+
   apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
 
   binutils = callPackage ../os-specific/darwin/binutils {
@@ -39,7 +41,7 @@ in
 
   osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { };
 
-  security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
+  security_tool = darwin.callPackage ../os-specific/darwin/security-tool {
     Security-framework = darwin.apple_sdk.frameworks.Security;
   };