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

darwin: don't include cf-private in framework dependencies

Browse Source 
Using cf-private can cause problems, it's better to include it
explicitly in places where it's actually required.
This commit is contained in:
Daiderd Jordan 2018-11-05 00:24:04 +01:00
parent 73cdd5a476
commit f2fadc0e91
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ with frameworks; with libs; {
CoreMIDIServer = []; CoreMIDIServer = [];
CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ]; CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ];
CoreMediaIO = [ CF CoreMedia ]; CoreMediaIO = [ CF CoreMedia ];
CoreText = [ CF CoreGraphics cf-private ]; CoreText = [ CF CoreGraphics ];
CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ]; CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ];
CoreWLAN = [ SecurityFoundation ]; CoreWLAN = [ SecurityFoundation ];
DVComponentGlue = [ CoreServices QuickTime ]; DVComponentGlue = [ CoreServices QuickTime ];
@ -48,8 +48,7 @@ with frameworks; with libs; {
ExceptionHandling = []; ExceptionHandling = [];
FWAUserLib = []; FWAUserLib = [];
ForceFeedback = [ CF IOKit ]; ForceFeedback = [ CF IOKit ];
# cf-private was moved first in list because of https://github.com/NixOS/nixpkgs/pull/28635 Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ];
Foundation = [ cf-private CF libobjc Security ApplicationServices SystemConfiguration ];
GLKit = [ CF ]; GLKit = [ CF ];
GLUT = [ OpenGL ]; GLUT = [ OpenGL ];
GSS = []; GSS = [];