Author: cillian
Date: Sat Jul 30 18:51:42 2011
New Revision: 28010
URL: https://svn.nixos.org/websvn/nix/?rev=28010&sc=1
Log:
Enabling optional jackaudio support for pulseaudio
Modified:
nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix
Modified: nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix Fri Jul 29 19:06:27
2011 (r28009)
+++ nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix Sat Jul 30 18:51:42
2011 (r28010)
@@ -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 @@
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 @@
'';
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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
