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

darwin: correct framework dependency

Browse Source 
AudioUnit depends on AudioToolbox now, so use that to keep
compatibility.
This commit is contained in:
Matthew Bauer 2019-04-22 21:22:07 -04:00
parent d490dad864
commit d1f988ca3c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libao/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ] ++ buildInputs = [ ] ++
lib.optional usePulseAudio libpulseaudio ++ lib.optional usePulseAudio libpulseaudio ++
lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ lib.optionals stdenv.isLinux [ alsaLib libcap ] ++
lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit AudioToolbox ]; lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

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

@ -10,12 +10,12 @@ with frameworks; with libs; {
AVKit = []; AVKit = [];
Accounts = []; Accounts = [];
AddressBook = [ Carbon CF ]; AddressBook = [ Carbon CF ];
AppKit = [ AudioToolbox Foundation QuartzCore ]; AppKit = [ AudioToolbox AudioUnit Foundation QuartzCore ];
AppKitScripting = []; AppKitScripting = [];
AppleScriptKit = []; AppleScriptKit = [];
AppleScriptObjC = []; AppleScriptObjC = [];
AudioToolbox = [ AudioUnit CoreAudio CF CoreMIDI ]; AudioToolbox = [ CoreAudio CF CoreMIDI ];
AudioUnit = [ Carbon CoreAudio CF ]; AudioUnit = [ AudioToolbox Carbon CoreAudio CF ];
AudioVideoBridging = [ Foundation ]; AudioVideoBridging = [ Foundation ];
Automator = []; Automator = [];
CFNetwork = [ CF ]; CFNetwork = [ CF ];
@ -33,7 +33,7 @@ with frameworks; with libs; {
CoreLocation = []; CoreLocation = [];
CoreMIDI = [ CF ]; CoreMIDI = [ CF ];
CoreMIDIServer = []; CoreMIDIServer = [];
CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ]; CoreMedia = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CF CoreGraphics CoreVideo ];
CoreMediaIO = [ CF CoreMedia ]; CoreMediaIO = [ CF CoreMedia ];
CoreText = [ CF CoreGraphics ]; CoreText = [ CF CoreGraphics ];
CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ]; CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ];
@ -72,7 +72,7 @@ with frameworks; with libs; {
LatentSemanticMapping = [ Carbon CF ]; LatentSemanticMapping = [ Carbon CF ];
MapKit = []; MapKit = [];
MediaAccessibility = [ CF CoreGraphics CoreText QuartzCore ]; MediaAccessibility = [ CF CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox CF CoreMedia ]; MediaToolbox = [ AudioToolbox AudioUnit CF CoreMedia ];
Metal = []; Metal = [];
NetFS = [ CF ]; NetFS = [ CF ];
OSAKit = [ Carbon ]; OSAKit = [ Carbon ];