From d87e3b2a5502af5ce0da9cea067e0ab338a1fac6 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 5 May 2016 18:39:58 -0400 Subject: [PATCH] libsndfile: pass AudioToolbox framework on darwin The libsndfile build system wants this framework when building on darwin. --- pkgs/development/libraries/libsndfile/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 547c7647b7a..85d30fdd79b 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffcbeddfb93..5d0aedcb966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7980,7 +7980,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 { };