diff options
Diffstat (limited to 'pkgs/servers/pulseaudio/default.nix')
-rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 40af62072439e..41c819cbe3fa4 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,25 +1,27 @@ { 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 -, ...}: +, gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext +, alsaLib, libsamplerate, libsndfile, speex, bluez, udev +, jackaudioSupport ? false, jackaudio ? null }: + +assert jackaudioSupport -> jackaudio != null; stdenv.mkDerivation rec { - name = "pulseaudio-0.9.21"; + name = "pulseaudio-0.9.23"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/pulseaudio/${name}.tar.gz"; - sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll"; + url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz"; + sha256 = "0kms3w1i48j9368amr8wv83gk4szrnglh1biyp8jyqyb2k388gmg"; }; # Since `libpulse*.la' contain `-lgdbm', it must be propagated. propagatedBuildInputs = [ gdbm ]; - buildInputs = [ - pkgconfig gnum4 libtool glib dbus avahi gconf liboil - libsamplerate libsndfile speex alsaLib libcap - gtk libX11 libICE libSM libXtst libXi - intltool gettext bluez udev - ]; + buildInputs = + [ pkgconfig gnum4 libtool intltool glib dbus avahi + libsamplerate libsndfile speex alsaLib bluez udev + #gtk gconf libX11 libICE libSM libXtst libXi + ] + ++ stdenv.lib.optional jackaudioSupport jackaudio; preConfigure = '' # Change the `padsp' script so that it contains the full path to @@ -33,10 +35,16 @@ stdenv.mkDerivation rec { ''; configureFlags = '' - --disable-solaris --disable-hal --disable-jack --localstatedir=/var + --disable-solaris --disable-hal --disable-jack --disable-oss-output --disable-oss-wrapper + --localstatedir=/var --sysconfdir=/etc + ${if jackaudioSupport then "--enable-jack" else ""} ''; + installFlags = "sysconfdir=$(out)/etc"; + + enableParallelBuilding = true; + meta = { description = "PulseAudio, a sound server for POSIX and Win32 systems"; |