pass jackaudio to alsaPlugins also adding convinient wrapper script

svn path=/nixpkgs/trunk/; revision=17340
This commit is contained in:
Marc Weber 2009-09-21 15:55:26 +00:00
parent 1d7de3605f
commit 8398a33112
3 changed files with 11 additions and 4 deletions

View File

@ -7,9 +7,8 @@ stdenv.mkDerivation {
sha256 = "000iqwlz93ykl0w19hw4qjh3gcw7f45ykmi91cw2m7dg4iy0igk7"; sha256 = "000iqwlz93ykl0w19hw4qjh3gcw7f45ykmi91cw2m7dg4iy0igk7";
}; };
# TODO make this customizable # TODO make backends such as jack, pulseaudio optional
buildInputs = [pkgconfig alsaLib pulseaudio]; buildInputs = [pkgconfig alsaLib pulseaudio jackaudio];
meta = { meta = {
description = "plugins for alsa eg conneckt jack, pluseaudio applications easily to the daemons using alsa devices"; description = "plugins for alsa eg conneckt jack, pluseaudio applications easily to the daemons using alsa devices";

View File

@ -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 "$@"
''

View File

@ -4915,7 +4915,10 @@ let
}; };
alsaPlugins = import ../os-specific/linux/alsa-plugins { 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 { alsaUtils = import ../os-specific/linux/alsa-utils {