diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-08 18:15:54 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-08 18:16:56 +0200 |
commit | 7cfb9545c6df3083bc0e461648e049781774786c (patch) | |
tree | 8f5bcfbd2475309855e26b5c3fecd061d97ba013 /pkgs | |
parent | c8ea9f749a13865d855e4b3e3fa9142aa7ba7dd1 (diff) | |
download | nixpkgs-7cfb9545c6df3083bc0e461648e049781774786c.tar nixpkgs-7cfb9545c6df3083bc0e461648e049781774786c.tar.gz nixpkgs-7cfb9545c6df3083bc0e461648e049781774786c.tar.bz2 nixpkgs-7cfb9545c6df3083bc0e461648e049781774786c.tar.lz nixpkgs-7cfb9545c6df3083bc0e461648e049781774786c.tar.xz nixpkgs-7cfb9545c6df3083bc0e461648e049781774786c.tar.zst nixpkgs-7cfb9545c6df3083bc0e461648e049781774786c.zip |
sox: Fix building on Darwin
Fixes #3493.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/audio/sox/default.nix | 29 | ||||
-rw-r--r-- | pkgs/development/libraries/libao/default.nix | 7 |
2 files changed, 17 insertions, 19 deletions
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 570699fb619..0663937c479 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null , enableLame ? false, lame ? null , enableLibmad ? true, libmad ? null , enableLibogg ? true, libogg ? null, libvorbis ? null }: -let - inherit (stdenv.lib) optional optionals; -in stdenv.mkDerivation rec { + +with stdenv.lib; + +stdenv.mkDerivation rec { name = "sox-14.4.1"; src = fetchurl { @@ -16,21 +17,17 @@ in stdenv.mkDerivation rec { }; buildInputs = - (optional enableAlsa alsaLib) ++ - (optional enableLibao libao) ++ - (optional enableLame lame) ++ - (optional enableLibmad libmad) ++ - (optionals enableLibogg [ libogg libvorbis ]); + optional (enableAlsa && stdenv.isLinux) alsaLib ++ + optional enableLibao libao ++ + optional enableLame lame ++ + optional enableLibmad libmad ++ + optionals enableLibogg [ libogg libvorbis ]; meta = { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; - maintainers = [stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.shlevy]; - # you can choose one of the following licenses: - license = [ - "GPL" - # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf - "libsamplerate Commercial Use License" - ]; + maintainers = [ lib.maintainers.marcweber lib.maintainers.shlevy ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index f1cc25de39f..401573378ee 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib +{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib , usePulseAudio }: stdenv.mkDerivation { @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9"; }; - buildInputs = [ pkgconfig alsaLib ] ++ (if usePulseAudio then [ pulseaudio ] - else [ alsaLib ]); + buildInputs = + [ pkgconfig ] ++ + lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]); meta = { longDescription = '' |