From 104eb099512cd403eca6ba77641c945cf814ab75 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Nov 2024 16:31:52 +0300 Subject: [PATCH] alsa-plugins: add more dependencies, make existing dependencies unconditional Add ffmpeg for a52 plugin, speexdsp for rate_speex plugin. Don't add libsamplerate (speexdsp is generally a better resampler), libavtp (not packaged currently, very niche). The current dependency handling is a weird hack, we don't need to do it, even if people override it to null it will be ignored. --- pkgs/by-name/al/alsa-plugins/package.nix | 26 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/al/alsa-plugins/package.nix b/pkgs/by-name/al/alsa-plugins/package.nix index 2d123e460a06..faf21f02f1e7 100644 --- a/pkgs/by-name/al/alsa-plugins/package.nix +++ b/pkgs/by-name/al/alsa-plugins/package.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchurl, lib, pkg-config, alsa-lib, libogg, libpulseaudio ? null, libjack2 ? null }: +{ + stdenv, + fetchurl, + lib, + pkg-config, + alsa-lib, + ffmpeg, + libjack2, + libogg, + libpulseaudio, + speexdsp, +}: stdenv.mkDerivation rec { pname = "alsa-plugins"; @@ -11,11 +22,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - # ToDo: a52, etc.? - buildInputs = - [ alsa-lib libogg ] - ++ lib.optional (libpulseaudio != null) libpulseaudio - ++ lib.optional (libjack2 != null) libjack2; + buildInputs = [ + alsa-lib + ffmpeg + libjack2 + libogg + libpulseaudio + speexdsp + ]; meta = with lib; { description = "Various plugins for ALSA";