@@ -1,27 +1,44 @@
1−{ buildPackages, pkgs, targetPackages
2−, darwin, stdenv, callPackage, callPackages, newScope
1+{ lib
2+, buildPackages, pkgs, targetPackages
3+, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget
4+, stdenv, splicePackages, newScope
35}:
46
57let
6− apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
8+ otherSplices = {
9+ selfBuildBuild = pkgsBuildBuild.darwin;
10+ selfBuildHost = pkgsBuildHost.darwin;
11+ selfBuildTarget = pkgsBuildTarget.darwin;
12+ selfHostHost = pkgsHostHost.darwin;
13+ selfTargetTarget = pkgsTargetTarget.darwin or {}; # might be missing
14+ };
715
8− impure-cmds = callPackage ../os-specific/darwin/impure-cmds { };
916in
1017
11−(impure-cmds // apple-source-releases // {
18+lib.makeScopeWithSplicing splicePackages newScope otherSplices (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let
19+ inherit (self) mkDerivation callPackage;
1220
13− callPackage = newScope (darwin.apple_sdk.frameworks // darwin);
21+ # Must use pkgs.callPackage to avoid infinite recursion.
1422
15− stdenvNoCF = stdenv.override {
16− extraBuildInputs = [];
23+ apple-source-releases = pkgs.callPackage ../os-specific/darwin/apple-source-releases { } self;
24+
25+ impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { };
26+
27+ apple_sdk = pkgs.callPackage ../os-specific/darwin/apple-sdk {
28+ inherit (buildPackages.darwin) print-reexports;
29+ inherit (self) darwin-stubs;
1730 };
31+in
32+
33+impure-cmds // apple-source-releases // {
1834
19− apple_sdk = callPackage ../os-specific/darwin/apple-sdk {
20− inherit (darwin) darwin-stubs print-reexports;
35+ inherit apple_sdk;
36+
37+ stdenvNoCF = stdenv.override {
38+ extraBuildInputs = [];
2139 };
2240
2341 binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
24− inherit (darwin) cctools;
2542 inherit (pkgs) binutils-unwrapped;
2643 inherit (pkgs.llvmPackages_7) llvm clang-unwrapped;
2744 };
@@ -31,17 +48,21 @@ in
3148 if stdenv.targetPlatform != stdenv.hostPlatform
3249 then pkgs.libcCross
3350 else pkgs.stdenv.cc.libc;
34− bintools = darwin.binutils-unwrapped;
51+ bintools = self.binutils-unwrapped;
52+ };
53+
54+ binutilsNoLibc = pkgs.wrapBintoolsWith {
55+ libc = null;
56+ bintools = self.binutils-unwrapped;
3557 };
3658
3759 cctools = callPackage ../os-specific/darwin/cctools/port.nix {
38− inherit (darwin) libobjc maloader libtapi;
3960 stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
4061 libcxxabi = pkgs.libcxxabi;
4162 };
4263
4364 # TODO: remove alias.
44− cf-private = darwin.apple_sdk.frameworks.CoreFoundation;
65+ cf-private = self.apple_sdk.frameworks.CoreFoundation;
4566
4667 DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
4768
@@ -50,15 +71,13 @@ in
5071 print-reexports = callPackage ../os-specific/darwin/apple-sdk/print-reexports { };
5172
5273 maloader = callPackage ../os-specific/darwin/maloader {
53− inherit (darwin) opencflite;
5474 };
5575
5676 insert_dylib = callPackage ../os-specific/darwin/insert_dylib { };
5777
58− iosSdkPkgs = darwin.callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix {
78+ iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix {
5979 buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
6080 targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
61− xcode = darwin.xcode;
6281 inherit (pkgs.llvmPackages) clang-unwrapped;
6382 };
6483
@@ -70,13 +89,13 @@ in
7089
7190 opencflite = callPackage ../os-specific/darwin/opencflite { };
7291
73− stubs = callPackages ../os-specific/darwin/stubs { };
92+ stubs = pkgs.callPackages ../os-specific/darwin/stubs { };
7493
75− trash = darwin.callPackage ../os-specific/darwin/trash { };
94+ trash = callPackage ../os-specific/darwin/trash { };
7695
7796 usr-include = callPackage ../os-specific/darwin/usr-include { };
7897
79− inherit (callPackages ../os-specific/darwin/xcode { })
98+ inherit (pkgs.callPackages ../os-specific/darwin/xcode { })
8099 xcode_8_1 xcode_8_2
81100 xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1
82101 xcode_10_2 xcode_10_2_1 xcode_10_3
@@ -85,10 +104,10 @@ in
85104
86105 CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
87106
88− CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; };
107+ CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { };
89108
90109 # 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
91− # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; };
110+ # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { };
92111
93112 darling = callPackage ../os-specific/darwin/darling/default.nix { };
94113
@@ -96,8 +115,6 @@ in
96115
97116 ios-deploy = callPackage ../os-specific/darwin/ios-deploy {};
98117
99− discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll {
100− inherit (darwin.apple_sdk.frameworks) Cocoa;
101− };
118+ discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { };
102119
103120})