diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 094134fb9423..8e32ece770cb 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -7,9 +7,8 @@ stdenv.mkDerivation { sha256 = "000iqwlz93ykl0w19hw4qjh3gcw7f45ykmi91cw2m7dg4iy0igk7"; }; - # TODO make this customizable - buildInputs = [pkgconfig alsaLib pulseaudio]; - + # TODO make backends such as jack, pulseaudio optional + buildInputs = [pkgconfig alsaLib pulseaudio jackaudio]; meta = { description = "plugins for alsa eg conneckt jack, pluseaudio applications easily to the daemons using alsa devices"; diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix new file mode 100644 index 000000000000..7dbd01bf058e --- /dev/null +++ b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix @@ -0,0 +1,5 @@ +{ writeScriptBin, stdenv, alsaPlugins }: +writeScriptBin "ap${if stdenv.system == "i686-linux" then "32" else "64"}" '' + #/bin/sh + ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@" +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2971461186a0..c2ea40e02fa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4915,7 +4915,10 @@ let }; alsaPlugins = import ../os-specific/linux/alsa-plugins { - inherit fetchurl stdenv lib pkgconfig alsaLib pulseaudio; + inherit fetchurl stdenv lib pkgconfig alsaLib pulseaudio jackaudio; + }; + alsaPluginWrapper = import ../os-specific/linux/alsa-plugins/wrapper.nix { + inherit stdenv alsaPlugins writeScriptBin; }; alsaUtils = import ../os-specific/linux/alsa-utils {