diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-28 13:34:13 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-28 13:34:53 -0700 |
| commit | 5207f6b45ccf270a28d44623acacace5aafddde0 (patch) | |
| tree | d48e5edb93d483aebd6dae8922eaeb44f30561fc /pkgs | |
| parent | 62ac96fdca74728f6788836b788eab418ece79bb (diff) | |
| download | nixlib-5207f6b45ccf270a28d44623acacace5aafddde0.tar nixlib-5207f6b45ccf270a28d44623acacace5aafddde0.tar.gz nixlib-5207f6b45ccf270a28d44623acacace5aafddde0.tar.bz2 nixlib-5207f6b45ccf270a28d44623acacace5aafddde0.tar.lz nixlib-5207f6b45ccf270a28d44623acacace5aafddde0.tar.xz nixlib-5207f6b45ccf270a28d44623acacace5aafddde0.tar.zst nixlib-5207f6b45ccf270a28d44623acacace5aafddde0.zip | |
clean up emacs framework dependencies
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 5 | ||||
| -rw-r--r-- | 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 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 diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 051919d2bd4a..af95dd604bb5 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 = []; |