From c7991b8a2b53cffc480c0b0af5e95a0227ffd6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 13 Dec 2009 20:19:19 +0000
Subject: [PATCH] PulseAudio 0.9.21.

svn path=/nixpkgs/trunk/; revision=18923
---
 pkgs/servers/pulseaudio/default.nix | 23 +++++++++++------------
 pkgs/top-level/all-packages.nix     |  9 +++------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 5f770c9cf7c..d20110961d4 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
-, gconf, liboil, libX11, libICE, libSM, intltool, gettext, alsaLib
-, libsamplerate, libsndfile, speex, ... }:
+, gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
+, libcap, alsaLib, libsamplerate, libsndfile, speex }:
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-0.9.13";
+  name = "pulseaudio-0.9.21";
 
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/pulseaudio/${name}.tar.gz";
-    sha256 = "0lwd5rcppyvcvy9n2j074k5mydgqszfvw6fnsjlz46gkda9vgydq";
+    sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@@ -15,25 +15,24 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
-    libsamplerate libsndfile speex alsaLib
-    libX11 libICE libSM
+    libsamplerate libsndfile speex alsaLib libcap
+    gtk libX11 libICE libSM libXtst libXi
     intltool gettext
   ];
 
   preConfigure = ''
-    # Disable the ConsoleKit module since we don't currently have that
-    # on NixOS.
-    sed -i "src/daemon/default.pa.in" \
-        -e 's/^\( *load-module \+module-console-kit\)/# \1/g'
-
     # Change the `padsp' script so that it contains the full path to
     # `libpulsedsp.so'.
     sed -i "src/utils/padsp" \
         -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g"
+
+    # Move the udev rules under $(prefix).
+    sed -i "src/Makefile.in" \
+        -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
   '';
 
   configureFlags = ''
-    --disable-solaris --disable-jack --disable-bluez --disable-polkit --with-x --enable-asyncdns --localstatedir=/var
+    --disable-solaris --disable-udev --disable-jack --disable-bluez --localstatedir=/var
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abbc0a3c960..7298d8d901d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4995,14 +4995,11 @@ let
   pulseaudio = makeOverridable (import ../servers/pulseaudio) {
     inherit fetchurl stdenv pkgconfig gnum4 gdbm
       dbus hal avahi liboil libsamplerate libsndfile speex
-      intltool gettext glib;
-    inherit (xlibs) libX11 libICE libSM;
+      intltool gettext libtool libcap;
+    inherit (xlibs) libX11 libICE libSM libXtst libXi;
+    inherit (gtkLibs) gtk glib;
     inherit alsaLib;    # Needs ALSA >= 1.0.17.
     gconf = gnome.GConf;
-
-    # Work around Libtool 1.5 interaction with Ltdl 2.x
-    # ("undefined reference to lt__PROGRAM__LTX_preloaded_symbols").
-    libtool = libtool_1_5;
   };
 
   tomcat_connectors = import ../servers/http/apache-modules/tomcat-connectors {