public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up emacs framework dependencies

Browse Source
This commit is contained in:
Jude Taylor 2015-10-28 13:34:13 -07:00
parent 62ac96fdca
commit 5207f6b45c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/editors/emacs-24/default.nix
View File

@ -48,10 +48,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK2) gtk2
++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (withX && withGTK3) gtk3
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc ]; ++ stdenv.lib.optional stdenv.isDarwin AppKit;
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
configureFlags = configureFlags =
if stdenv.isDarwin if stdenv.isDarwin

4
pkgs/os-specific/darwin/apple-sdk/frameworks.nix
View File

@ -10,7 +10,7 @@ with frameworks; with libs; {
AVKit = []; AVKit = [];
Accounts = []; Accounts = [];
AddressBook = [ Carbon CF ]; AddressBook = [ Carbon CF ];
AppKit = [ AudioToolbox QuartzCore ]; AppKit = [ AudioToolbox Foundation QuartzCore ];
AppKitScripting = []; AppKitScripting = [];
AppleScriptKit = []; AppleScriptKit = [];
AppleScriptObjC = []; AppleScriptObjC = [];
@ -46,7 +46,7 @@ with frameworks; with libs; {
ExceptionHandling = []; ExceptionHandling = [];
FWAUserLib = []; FWAUserLib = [];
ForceFeedback = [ CF IOKit ]; ForceFeedback = [ CF IOKit ];
Foundation = [ CF libobjc Security ApplicationServices AppKit SystemConfiguration ]; Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ];
GLKit = [ CF ]; GLKit = [ CF ];
GLUT = [ GL OpenGL ]; GLUT = [ GL OpenGL ];
GSS = []; GSS = [];