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

darwin-frameworks: remove CF

Browse Source 
CoreFoundation is included by the stdenv, moving the decision of what
version should be used there makes it possible to override it entirely
rather then prepending flags like cf-private does which can be
unreliable.
This commit is contained in:
Daiderd Jordan 2019-06-17 23:12:07 +02:00
parent f38fbf853f
commit c2b76fa13c
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ in rec {
__propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ]; __propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ];
propagatedBuildInputs = with frameworks; [ propagatedBuildInputs = with frameworks; [
OpenGL ApplicationServices Carbon IOKit pkgs.darwin.CF CoreGraphics CoreServices CoreText OpenGL ApplicationServices Carbon IOKit CoreGraphics CoreServices CoreText
]; ];
installPhase = '' installPhase = ''
@ -222,7 +222,7 @@ in rec {
bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix {
inherit frameworks libs; inherit frameworks libs;
inherit (pkgs.darwin) CF cf-private libobjc; inherit (pkgs.darwin) cf-private libobjc;
}); });
frameworks = bareFrameworks // overrides bareFrameworks; frameworks = bareFrameworks // overrides bareFrameworks;

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

@ -2,81 +2,81 @@
# Epic weird knot-tying happening here. # Epic weird knot-tying happening here.
# TODO: clean up the process for generating this and include it # TODO: clean up the process for generating this and include it
{ frameworks, libs, CF, libobjc, cf-private }: { frameworks, libs, libobjc, cf-private }:
with frameworks; with libs; { with frameworks; with libs; {
AGL = [ Carbon OpenGL ]; AGL = [ Carbon OpenGL ];
AVFoundation = [ ApplicationServices CoreGraphics ]; AVFoundation = [ ApplicationServices CoreGraphics ];
AVKit = []; AVKit = [];
Accounts = []; Accounts = [];
AddressBook = [ Carbon CF ]; AddressBook = [ Carbon ];
AppKit = [ AudioToolbox AudioUnit Foundation QuartzCore ]; AppKit = [ AudioToolbox AudioUnit Foundation QuartzCore ];
AppKitScripting = []; AppKitScripting = [];
AppleScriptKit = []; AppleScriptKit = [];
AppleScriptObjC = []; AppleScriptObjC = [];
AudioToolbox = [ CoreAudio CF CoreMIDI ]; AudioToolbox = [ CoreAudio CoreMIDI ];
AudioUnit = [ AudioToolbox Carbon CoreAudio CF ]; AudioUnit = [ AudioToolbox Carbon CoreAudio ];
AudioVideoBridging = [ Foundation ]; AudioVideoBridging = [ Foundation ];
Automator = []; Automator = [];
CFNetwork = [ CF ]; CFNetwork = [];
CalendarStore = []; CalendarStore = [];
Cocoa = [ AppKit ]; Cocoa = [ AppKit ];
Collaboration = []; Collaboration = [];
# Impure version of CoreFoundation, this should not be used unless another # Impure version of CoreFoundation, this should not be used unless another
# framework includes headers that are not available in the pure version. # framework includes headers that are not available in the pure version.
CoreFoundation = []; CoreFoundation = [];
CoreAudio = [ CF IOKit ]; CoreAudio = [ IOKit ];
CoreAudioKit = [ AudioUnit ]; CoreAudioKit = [ AudioUnit ];
CoreData = []; CoreData = [];
CoreGraphics = [ Accelerate CF IOKit IOSurface SystemConfiguration ]; CoreGraphics = [ Accelerate IOKit IOSurface SystemConfiguration ];
CoreImage = [ ]; CoreImage = [];
CoreLocation = []; CoreLocation = [];
CoreMIDI = [ CF ]; CoreMIDI = [];
CoreMIDIServer = []; CoreMIDIServer = [];
CoreMedia = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CF CoreGraphics CoreVideo ]; CoreMedia = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CoreGraphics CoreVideo ];
CoreMediaIO = [ CF CoreMedia ]; CoreMediaIO = [ CoreMedia ];
CoreText = [ CF CoreGraphics ]; CoreText = [ CoreGraphics ];
CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ]; CoreVideo = [ ApplicationServices CoreGraphics IOSurface OpenGL ];
CoreWLAN = [ SecurityFoundation ]; CoreWLAN = [ SecurityFoundation ];
DVDPlayback = []; DVDPlayback = [];
DirectoryService = [ CF ]; DirectoryService = [];
DiscRecording = [ CF CoreServices IOKit ]; DiscRecording = [ CoreServices IOKit ];
DiscRecordingUI = []; DiscRecordingUI = [];
DiskArbitration = [ CF IOKit ]; DiskArbitration = [ IOKit ];
EventKit = []; EventKit = [];
ExceptionHandling = []; ExceptionHandling = [];
FWAUserLib = []; FWAUserLib = [];
ForceFeedback = [ CF IOKit ]; ForceFeedback = [ IOKit ];
Foundation = [ cf-private libobjc Security ApplicationServices SystemConfiguration ]; Foundation = [ cf-private libobjc Security ApplicationServices SystemConfiguration ];
GLKit = [ CF ]; GLKit = [ ];
GLUT = [ OpenGL ]; GLUT = [ OpenGL ];
GSS = []; GSS = [];
GameController = []; GameController = [];
GameKit = [ Foundation ]; GameKit = [ Foundation ];
Hypervisor = []; Hypervisor = [];
ICADevices = [ Carbon CF IOBluetooth ]; ICADevices = [ Carbon IOBluetooth ];
IMServicePlugIn = []; IMServicePlugIn = [];
IOBluetoothUI = [ IOBluetooth ]; IOBluetoothUI = [ IOBluetooth ];
IOKit = [ CF ]; IOKit = [];
IOSurface = [ CF IOKit xpc ]; IOSurface = [ IOKit xpc ];
ImageCaptureCore = []; ImageCaptureCore = [];
ImageIO = [ CF CoreGraphics ]; ImageIO = [ CoreGraphics ];
InputMethodKit = [ Carbon ]; InputMethodKit = [ Carbon ];
InstallerPlugins = []; InstallerPlugins = [];
InstantMessage = []; InstantMessage = [];
JavaFrameEmbedding = []; JavaFrameEmbedding = [];
JavaScriptCore = [ CF ]; JavaScriptCore = [];
Kerberos = []; Kerberos = [];
Kernel = [ CF IOKit ]; Kernel = [ IOKit ];
LDAP = []; LDAP = [];
LatentSemanticMapping = [ Carbon CF ]; LatentSemanticMapping = [ Carbon ];
MapKit = []; MapKit = [];
MediaAccessibility = [ CF CoreGraphics CoreText QuartzCore ]; MediaAccessibility = [ CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox AudioUnit CF CoreMedia ]; MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ];
Metal = []; Metal = [];
MetalKit = [ ModelIO Metal ]; MetalKit = [ ModelIO Metal ];
ModelIO = [ ]; ModelIO = [ ];
NetFS = [ CF ]; NetFS = [];
OSAKit = [ Carbon ]; OSAKit = [ Carbon ];
OpenAL = []; OpenAL = [];
OpenCL = [ IOSurface OpenGL ]; OpenCL = [ IOSurface OpenGL ];
@ -85,37 +85,37 @@ with frameworks; with libs; {
PreferencePanes = []; PreferencePanes = [];
PubSub = []; PubSub = [];
QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
QuickLook = [ ApplicationServices CF ]; QuickLook = [ ApplicationServices ];
SceneKit = []; SceneKit = [];
ScreenSaver = []; ScreenSaver = [];
Scripting = []; Scripting = [];
ScriptingBridge = []; ScriptingBridge = [];
Security = [ CF IOKit ]; Security = [ IOKit ];
SecurityFoundation = []; SecurityFoundation = [];
SecurityInterface = [ Security ]; SecurityInterface = [ Security ];
ServiceManagement = [ CF Security ]; ServiceManagement = [ Security ];
Social = []; Social = [];
SpriteKit = []; SpriteKit = [];
StoreKit = []; StoreKit = [];
SyncServices = []; SyncServices = [];
SystemConfiguration = [ CF Security ]; SystemConfiguration = [ Security ];
TWAIN = [ Carbon ]; TWAIN = [ Carbon ];
Tcl = []; Tcl = [];
VideoDecodeAcceleration = [ CF CoreVideo ]; VideoDecodeAcceleration = [ CoreVideo ];
VideoToolbox = [ CF CoreMedia CoreVideo ]; VideoToolbox = [ CoreMedia CoreVideo ];
WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ]; WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ];
# Umbrellas # Umbrellas
Accelerate = [ CoreWLAN IOBluetooth ]; Accelerate = [ CoreWLAN IOBluetooth ];
ApplicationServices = [ CF CoreServices CoreText ImageIO ]; ApplicationServices = [ CoreServices CoreText ImageIO ];
Carbon = [ ApplicationServices CF CoreServices Foundation IOKit Security QuartzCore ]; Carbon = [ ApplicationServices CoreServices Foundation IOKit Security QuartzCore ];
CoreBluetooth = []; CoreBluetooth = [];
CoreServices = [ CFNetwork CoreAudio CoreData CF DiskArbitration Security NetFS OpenDirectory ServiceManagement ]; CoreServices = [ CFNetwork CoreAudio CoreData DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
IOBluetooth = [ IOKit ]; IOBluetooth = [ IOKit ];
JavaVM = []; JavaVM = [];
OpenDirectory = []; OpenDirectory = [];
Quartz = [ QuickLook QTKit ]; Quartz = [ QuickLook QTKit ];
QuartzCore = [ ApplicationServices CF CoreVideo OpenCL CoreImage Metal ]; QuartzCore = [ ApplicationServices CoreVideo OpenCL CoreImage Metal ];
QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
vmnet = []; vmnet = [];

4
pkgs/top-level/darwin-packages.nix
View File

@ -10,6 +10,10 @@ in
callPackage = newScope (darwin.apple_sdk.frameworks // darwin); callPackage = newScope (darwin.apple_sdk.frameworks // darwin);
stdenvNoCF = stdenv.override {
extraBuildInputs = [];
};
apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
binutils-unwrapped = callPackage ../os-specific/darwin/binutils { binutils-unwrapped = callPackage ../os-specific/darwin/binutils {