diff options
| -rw-r--r-- | pkgs/development/libraries/libsndfile/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 1fac43fa2a97..48a2999e7af9 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: +{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig +, Carbon +}: stdenv.mkDerivation rec { name = "libsndfile-1.0.25"; @@ -8,7 +10,8 @@ stdenv.mkDerivation rec { 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 # compile this on darwin -- not sure how to handle diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eee8e528fbbd..4fa3bfeb29ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7433,7 +7433,9 @@ let # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 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 { }; |