diff options
author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-07-04 14:52:51 +1000 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2013-07-12 16:26:43 +0200 |
commit | 7ef50f50986b0a830051e641f1a5c795d79d8460 (patch) | |
tree | 61355b2718a0c1ee67d154af35d42c8b80432db2 | |
parent | 0024926701875c6cac245281f07d899f2ee14d92 (diff) | |
download | nixpkgs-7ef50f50986b0a830051e641f1a5c795d79d8460.tar nixpkgs-7ef50f50986b0a830051e641f1a5c795d79d8460.tar.gz nixpkgs-7ef50f50986b0a830051e641f1a5c795d79d8460.tar.bz2 nixpkgs-7ef50f50986b0a830051e641f1a5c795d79d8460.tar.lz nixpkgs-7ef50f50986b0a830051e641f1a5c795d79d8460.tar.xz nixpkgs-7ef50f50986b0a830051e641f1a5c795d79d8460.tar.zst nixpkgs-7ef50f50986b0a830051e641f1a5c795d79d8460.zip |
audiofile: fix build on darwin
* disable alsaLib * build with gccApple
-rw-r--r-- | pkgs/development/libraries/audiofile/default.nix | 11 | ||||
-rw-r--r-- | 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 8ea6470cde8..1190f7437cb 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 c69fc1a4962..c19d1126d8c 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 { }; |