From 4685bd7853c40ec970eaf722fcae993c10bb1b5d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 Nov 2016 14:56:58 -0600
Subject: [PATCH] xcbuild: update meta and comments

---
 .../Librpcsvc/default.nix                      |  1 -
 .../apple-source-releases/adv_cmds/xcode.nix   |  8 +++++++-
 .../network_cmds/default.nix                   | 18 +++++++++++-------
 pkgs/tools/misc/contacts/default.nix           |  1 +
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
index b20687b41593..512ec6253c78 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
@@ -17,7 +17,6 @@ appleDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "";
     maintainers = with maintainers; [ matthewbauer ];
     platforms   = platforms.darwin;
     license     = licenses.apsl20;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index 7a8fdde69feb..fedd49022380 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -1,7 +1,13 @@
 { stdenv, appleDerivation, fetchurl, xcbuild, libcxx }:
 
 appleDerivation {
-  # disable pkill from build
+
+  # pkill requires special private headers that are unavailable in
+  # NixPkgs. These ones are needed:
+  #  - xpc/xpxc.h
+  #  - os/base_private.h
+  #  - _simple.h
+  # We disable it here for now. TODO: build pkill inside adv_cmds
   patchPhase = ''
     substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
       --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," ""
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 090a9d05fb87..71acb833cc3f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -5,8 +5,10 @@ appleDerivation rec {
 
   NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6";
 
+  # "spray" requires some files that aren't compiling correctly in xcbuild.
+  # "rtadvd" seems to fail with some missing constants.
+  # We disable spray and rtadvd here for now.
   patchPhase = ''
-    # disable spray, rtadvd
     substituteInPlace network_cmds.xcodeproj/project.pbxproj \
       --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \
       --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," ""
@@ -22,14 +24,16 @@ appleDerivation rec {
       install */*.$n $out/share/man/man$n
     done
 
-    mkdir -p $out/etc/
-    install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/
+    # TODO: patch files to load from $out/ instead of /usr/
 
-    mkdir -p $out/local/OpenSourceVersions/
-    install network_cmds.plist $out/local/OpenSourceVersions/
+    # mkdir -p $out/etc/
+    # install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/
 
-    mkdir -p $out/System/Library/LaunchDaemons
-    install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons
+    # mkdir -p $out/local/OpenSourceVersions/
+    # install network_cmds.plist $out/local/OpenSourceVersions/
+
+    # mkdir -p $out/System/Library/LaunchDaemons
+    # install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons
  '';
 
   meta = {
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index 5c91332463f0..d146cd93343e 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     cp ./contacts-*/Build/Products/Default/contacts $out/bin
   '';
 
+  ## FIXME: the framework setup hook isn't adding these correctly
   NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/";
 
   meta = with stdenv.lib; {