diff options
| author | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-07-30 18:51:42 +0000 |
|---|---|---|
| committer | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-07-30 18:51:42 +0000 |
| commit | 415be547b31a48f0047fd2b0e13370d05fa5af38 (patch) | |
| tree | 63d8030725487322699643b632996f22fa5b8d09 /pkgs/servers | |
| parent | 2c17fb436bde30bf802435d90f0b1078e4429c5f (diff) | |
Enabling optional jackaudio support for pulseaudio
svn path=/nixpkgs/trunk/; revision=28010
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 40af62072439..aabb276523a1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext , libcap, alsaLib, libsamplerate, libsndfile, speex, bluez, udev +, jackaudioSupport ? false, jackaudio ? null , ...}: +assert jackaudioSupport -> jackaudio != null; + stdenv.mkDerivation rec { name = "pulseaudio-0.9.21"; @@ -18,8 +21,8 @@ stdenv.mkDerivation rec { pkgconfig gnum4 libtool glib dbus avahi gconf liboil libsamplerate libsndfile speex alsaLib libcap gtk libX11 libICE libSM libXtst libXi - intltool gettext bluez udev - ]; + intltool gettext bluez udev] + ++ stdenv.lib.optional jackaudioSupport jackaudio; preConfigure = '' # Change the `padsp' script so that it contains the full path to @@ -33,8 +36,9 @@ stdenv.mkDerivation rec { ''; configureFlags = '' - --disable-solaris --disable-hal --disable-jack --localstatedir=/var + --disable-solaris --disable-hal --localstatedir=/var --disable-oss-output --disable-oss-wrapper + ${if (!jackaudioSupport) then "--disable-jack" else ""} ''; meta = { |