From 508555518df17e7b31cc46d6edca1531790d57f7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 29 Apr 2019 14:23:39 +0000 Subject: [PATCH] sox: Add option to include opus support Many other distributions include opus support in their sox distributions. This patch makes such an option, and sets it to be enabled by default. This works when ogg is disabled as as well as when ogg is enabled. --- pkgs/applications/misc/audio/sox/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index a598ec1caca..622e7169fae 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,9 +1,10 @@ -{ config, lib, stdenv, fetchurl, CoreAudio +{ config, lib, stdenv, fetchurl, pkgconfig, CoreAudio , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null , enableLame ? config.sox.enableLame or false, lame ? null , enableLibmad ? true, libmad ? null , enableLibogg ? true, libogg ? null, libvorbis ? null +, enableOpusfile ? true, opusfile ? null , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null , enableLibsndfile ? true, libsndfile ? null @@ -22,12 +23,16 @@ stdenv.mkDerivation rec { sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; }; + # configure.ac uses pkg-config only to locate libopusfile + nativeBuildInputs = optional enableOpusfile pkgconfig; + buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ optional enableLibao libao ++ optional enableLame lame ++ optional enableLibmad libmad ++ optionals enableLibogg [ libogg libvorbis ] ++ + optional enableOpusfile opusfile ++ optional enableFLAC flac ++ optional enablePNG libpng ++ optional enableLibsndfile libsndfile ++