diff options
author | Jude Taylor <me@jude.bio> | 2015-10-11 12:09:06 -0700 |
---|---|---|
committer | Jude Taylor <me@jude.bio> | 2015-10-11 12:09:27 -0700 |
commit | b345f70939ca0249b9fc019d7c6acd2398f869d1 (patch) | |
tree | 3d2b056968e86d2669052674402d13234f1bdaa4 /pkgs/applications/editors/emacs-24 | |
parent | 4f1db1f0f85a1dc623816c1581354ad4467adafd (diff) | |
download | nixlib-b345f70939ca0249b9fc019d7c6acd2398f869d1.tar nixlib-b345f70939ca0249b9fc019d7c6acd2398f869d1.tar.gz nixlib-b345f70939ca0249b9fc019d7c6acd2398f869d1.tar.bz2 nixlib-b345f70939ca0249b9fc019d7c6acd2398f869d1.tar.lz nixlib-b345f70939ca0249b9fc019d7c6acd2398f869d1.tar.xz nixlib-b345f70939ca0249b9fc019d7c6acd2398f869d1.tar.zst nixlib-b345f70939ca0249b9fc019d7c6acd2398f869d1.zip |
propagate cf-private with AppKit; fixes emacs and others
Diffstat (limited to 'pkgs/applications/editors/emacs-24')
-rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 6 |
1 files changed, 2 insertions, 4 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"; |