From 5207f6b45ccf270a28d44623acacace5aafddde0 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 28 Oct 2015 13:34:13 -0700 Subject: [PATCH] clean up emacs framework dependencies --- pkgs/applications/editors/emacs-24/default.nix | 5 +---- pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index eb814eab6f5..e847bb42d79 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -48,10 +48,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ 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"; + ++ stdenv.lib.optional stdenv.isDarwin AppKit; configureFlags = if stdenv.isDarwin diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 051919d2bd4..af95dd604bb 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -10,7 +10,7 @@ with frameworks; with libs; { AVKit = []; Accounts = []; AddressBook = [ Carbon CF ]; - AppKit = [ AudioToolbox QuartzCore ]; + AppKit = [ AudioToolbox Foundation QuartzCore ]; AppKitScripting = []; AppleScriptKit = []; AppleScriptObjC = []; @@ -46,7 +46,7 @@ with frameworks; with libs; { ExceptionHandling = []; FWAUserLib = []; ForceFeedback = [ CF IOKit ]; - Foundation = [ CF libobjc Security ApplicationServices AppKit SystemConfiguration ]; + Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ]; GLKit = [ CF ]; GLUT = [ GL OpenGL ]; GSS = [];