From f14841f3ce734b27988a605fc9775a035d313d23 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 13 May 2018 00:01:52 +0200
Subject: [PATCH] Revert "darwin.libSystem: multiple outputs"

Broke the stdenv.

This reverts commit 69d1b7ab79cc5e46d4b419cfe95c30e58f801a85.
---
 .../apple-source-releases/Libsystem/default.nix  | 16 ++++++----------
 pkgs/stdenv/darwin/default.nix                   |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 152f3c5bae3..386480d6290 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -3,17 +3,10 @@
   removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
 
 appleDerivation rec {
+  phases = [ "unpackPhase" "installPhase" ];
+
   nativeBuildInputs = [ cpio ];
 
-  outputs = [ "out" "dev" ];
-
-  bundledHeaders = map stdenv.lib.getDev [ Libc Libm Libinfo dyld architecture
-                                           libclosure CarbonHeaders libdispatch
-                                           ncurses CommonCrypto copyfile
-                                           removefile libresolv Libnotify
-                                           libplatform mDNSResponder launchd
-                                           libutil libpthread ];
-
   installPhase = ''
     export NIX_ENFORCE_PURITY=
 
@@ -24,10 +17,13 @@ appleDerivation rec {
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h        $out/include
 
-    for dep in $bundledHeaders; do
+    for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
+               ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
+               ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
       (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
     done
 
+
     (cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
 
     cat <<EOF > $out/include/TargetConditionals.h
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 98102cd5654..9563f52ea26 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -225,7 +225,7 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld Libsystem Libsystem.dev CF ICU locale ]);
+      (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
 
     overrides = persistent;
   };
@@ -263,7 +263,7 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld ICU Libsystem Libsystem.dev locale ]);
+      (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
 
     overrides = persistent;
   };
@@ -383,7 +383,7 @@ in rec {
       binutils.bintools darwin.binutils darwin.binutils.bintools
       cc.expand-response-params
     ]) ++ (with pkgs.darwin; [
-      dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale
+      dyld Libsystem CF cctools ICU libiconv locale
     ]);
 
     overrides = self: super: