diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-22 21:22:07 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:55:03 -0400 |
| commit | d1f988ca3c22baf0e637eb1f082a49cad2c4ea31 (patch) | |
| tree | ba0834022f8aa6d8a7e71badd35777b64202a337 | |
| parent | d490dad864c7ff61eefc21a8c5bdf71aebf6627e (diff) | |
| download | nixlib-d1f988ca3c22baf0e637eb1f082a49cad2c4ea31.tar nixlib-d1f988ca3c22baf0e637eb1f082a49cad2c4ea31.tar.gz nixlib-d1f988ca3c22baf0e637eb1f082a49cad2c4ea31.tar.bz2 nixlib-d1f988ca3c22baf0e637eb1f082a49cad2c4ea31.tar.lz nixlib-d1f988ca3c22baf0e637eb1f082a49cad2c4ea31.tar.xz nixlib-d1f988ca3c22baf0e637eb1f082a49cad2c4ea31.tar.zst nixlib-d1f988ca3c22baf0e637eb1f082a49cad2c4ea31.zip | |
darwin: correct framework dependency
AudioUnit depends on AudioToolbox now, so use that to keep compatibility.
| -rw-r--r-- | pkgs/development/libraries/libao/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index da9bc2149f38..c1cf3215c16c 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ lib.optional usePulseAudio libpulseaudio ++ lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ - lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit AudioToolbox ]; + lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 2a8c2e89204e..e55abf9dfb65 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -10,12 +10,12 @@ with frameworks; with libs; { AVKit = []; Accounts = []; AddressBook = [ Carbon CF ]; - AppKit = [ AudioToolbox Foundation QuartzCore ]; + AppKit = [ AudioToolbox AudioUnit Foundation QuartzCore ]; AppKitScripting = []; AppleScriptKit = []; AppleScriptObjC = []; - AudioToolbox = [ AudioUnit CoreAudio CF CoreMIDI ]; - AudioUnit = [ Carbon CoreAudio CF ]; + AudioToolbox = [ CoreAudio CF CoreMIDI ]; + AudioUnit = [ AudioToolbox Carbon CoreAudio CF ]; AudioVideoBridging = [ Foundation ]; Automator = []; CFNetwork = [ CF ]; @@ -33,7 +33,7 @@ with frameworks; with libs; { CoreLocation = []; CoreMIDI = [ CF ]; CoreMIDIServer = []; - CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ]; + CoreMedia = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CF CoreGraphics CoreVideo ]; CoreMediaIO = [ CF CoreMedia ]; CoreText = [ CF CoreGraphics ]; CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ]; @@ -72,7 +72,7 @@ with frameworks; with libs; { LatentSemanticMapping = [ Carbon CF ]; MapKit = []; MediaAccessibility = [ CF CoreGraphics CoreText QuartzCore ]; - MediaToolbox = [ AudioToolbox CF CoreMedia ]; + MediaToolbox = [ AudioToolbox AudioUnit CF CoreMedia ]; Metal = []; NetFS = [ CF ]; OSAKit = [ Carbon ]; |