From 7ef50f50986b0a830051e641f1a5c795d79d8460 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:52:51 +1000 Subject: [PATCH] audiofile: fix build on darwin * disable alsaLib * build with gccApple --- pkgs/development/libraries/audiofile/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 8ea6470cde84..1190f7437cbc 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -3,17 +3,18 @@ stdenv.mkDerivation rec { name = "audiofile-0.3.3"; - buildInputs = [ alsaLib ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; src = fetchurl { url = "http://audiofile.68k.org/${name}.tar.gz"; sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq"; }; - meta = { + meta = with stdenv.lib; { description = "A library for reading and writing audio files in various formats"; - homepage = http://www.68k.org/~michael/audiofile/; - license = "lgpl"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + homepage = http://www.68k.org/~michael/audiofile/; + license = licenses.lgpl; + maintainers = with maintainers; [ lovek323 shlevy ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c69fc1a4962c..c19d1126d8c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3703,7 +3703,11 @@ let aubio = callPackage ../development/libraries/aubio { }; - audiofile = callPackage ../development/libraries/audiofile { }; + audiofile = callPackage ../development/libraries/audiofile { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; axis = callPackage ../development/libraries/axis { };