alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #15251 from acowley/libsndfile

Browse source 
libsndfile: pass AudioToolbox framework on darwin
This commit is contained in:
Joachim Fasting 2016-05-07 22:26:13 +02:00
parent 3772de4961 d87e3b2a55
commit 3249d87b37
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libsndfile/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig
, Carbon
, Carbon, AudioToolbox
}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig flac libogg libvorbis ]
++ stdenv.lib.optional stdenv.isDarwin Carbon;
++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View file

@ -8043,7 +8043,7 @@ in
libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
libsndfile = callPackage ../development/libraries/libsndfile {
inherit (darwin.apple_sdk.frameworks) Carbon;
inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox;
};
libsodium = callPackage ../development/libraries/libsodium { };