From e48c2d520ec27eea32a89464cc66e92f7e381235 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 12 Sep 2015 21:23:30 +0900 Subject: [PATCH] sox: enable libsndfile, amr-nb, amr-wb (close #9824) --- pkgs/applications/misc/audio/sox/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9a30e4669ee..b4f01bc642b 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -6,6 +6,9 @@ , enableLibogg ? true, libogg ? null, libvorbis ? null , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null +, enableLibsndfile ? true, libsndfile ? null +# amrnb and amrwb are unfree, disabled by default +, enableAMR ? false, amrnb ? null, amrwb ? null }: with stdenv.lib; @@ -25,13 +28,15 @@ stdenv.mkDerivation rec { optional enableLibmad libmad ++ optionals enableLibogg [ libogg libvorbis ] ++ optional enableFLAC flac ++ - optional enablePNG libpng; + optional enablePNG libpng ++ + optional enableLibsndfile libsndfile ++ + optionals enableAMR [ amrnb amrwb ]; meta = { description = "Sample Rate Converter for audio"; homepage = http://sox.sourceforge.net/; maintainers = [ lib.maintainers.marcweber ]; - license = lib.licenses.gpl2Plus; + license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }