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

darwin: libsndfile: add missing darwin deps

Browse source
This commit is contained in:
Stéphane Jourdois 2015-11-11 22:55:44 +01:00
parent 00da78070e
commit eed349522f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,6 @@
{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: { stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig
, Carbon
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsndfile-1.0.25"; name = "libsndfile-1.0.25";
@ -8,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar"; sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar";
}; };
buildInputs = [ pkgconfig flac libogg libvorbis ]; buildInputs = [ pkgconfig flac libogg libvorbis ]
++ stdenv.lib.optional stdenv.isDarwin Carbon;
# need headers from the Carbon.framework in /System/Library/Frameworks to # need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle # compile this on darwin -- not sure how to handle

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

@ -7433,7 +7433,9 @@ let
# To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
libsndfile = callPackage ../development/libraries/libsndfile { }; libsndfile = callPackage ../development/libraries/libsndfile {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
libsodium = callPackage ../development/libraries/libsodium { }; libsodium = callPackage ../development/libraries/libsodium { };