From b345f70939ca0249b9fc019d7c6acd2398f869d1 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 11 Oct 2015 12:09:06 -0700
Subject: [PATCH] propagate cf-private with AppKit; fixes emacs and others

---
 pkgs/applications/editors/emacs-24/default.nix | 6 ++----
 pkgs/os-specific/darwin/apple-sdk/default.nix  | 6 +++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index e0d74afabcd3..eb814eab6f52 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -47,10 +47,8 @@ stdenv.mkDerivation rec {
         imagemagick gconf ]
     ++ stdenv.lib.optional (withX && withGTK2) gtk2
     ++ stdenv.lib.optional (withX && withGTK3) gtk3
-    ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
-
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc
-  ];
+    ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo
+    ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc ];
 
   NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
     "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 520d7019513e..59a816e9b943 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xar, gzip, cpio, CF }:
+{ stdenv, fetchurl, xar, gzip, cpio, CF, pkgs }:
 
 let
   # sadly needs to be exported because security_tool needs it
@@ -148,6 +148,10 @@ in rec {
   };
 
   overrides = super: {
+    AppKit = stdenv.lib.overrideDerivation super.AppKit (drv: {
+      propagatedNativeBuildInputs = drv.propagatedNativeBuildInputs ++ [ pkgs.darwin.cf-private ];
+    });
+
     QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: {
       installPhase = drv.installPhase + ''
         f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h"