From 949c4017b566271a92cef107b828f8b81ce3e283 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 29 Oct 2015 13:55:30 -0700
Subject: [PATCH] emacs-24-mac: propagate frameworks

---
 pkgs/applications/editors/emacs-24/macport-24.5.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix                     |  1 -
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index eaed603ffee2..0801819a3181 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, Carbon, Foundation,
-libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit, cf-private
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
+, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit
 }:
 
 stdenv.mkDerivation rec {
@@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
     sha256 = "0p4jh6s1qi6jm6zr82grk65x33ix1hb0fbpih4vh3vnx6310iwsb";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
-
   enableParallelBuilding = true;
 
   buildInputs = [
-    ncurses pkgconfig texinfo libxml2 gnutls Carbon Cocoa Foundation libobjc WebKit Quartz
-    ImageCaptureCore OSAKit cf-private
+    ncurses pkgconfig texinfo libxml2 gnutls
+  ];
+
+  propagatedBuildInputs = [
+    Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit
   ];
 
   postUnpack = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cc7aa98ed21..df72eafdfcb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11306,7 +11306,6 @@ let
   });
   emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix {
     stdenv = pkgs.clangStdenv;
-    inherit (darwin) libobjc cf-private;
   });
   emacs24Macport = self.emacs24Macport_24_5;