From 5207f6b45ccf270a28d44623acacace5aafddde0 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 28 Oct 2015 13:34:13 -0700 Subject: clean up emacs framework dependencies --- pkgs/applications/editors/emacs-24/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs/applications/editors/emacs-24') diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index eb814eab6f52..e847bb42d791 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 -- cgit 1.4.1