From 288c414bb4453807599af98a2a709271b90ee305 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 31 Jul 2010 13:05:58 +0000
Subject: [PATCH] pulseaudio: udev and bluez support

svn path=/nixpkgs/trunk/; revision=22834
---
 pkgs/servers/pulseaudio/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix     |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index e2e948754517..40af62072439 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
+{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
-, libcap, alsaLib, libsamplerate, libsndfile, speex
+, libcap, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
 , ...}:
 
 stdenv.mkDerivation rec {
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gdbm ];
 
   buildInputs = [
-    pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
+    pkgconfig gnum4 libtool glib dbus avahi gconf liboil
     libsamplerate libsndfile speex alsaLib libcap
     gtk libX11 libICE libSM libXtst libXi
-    intltool gettext
+    intltool gettext bluez udev
   ];
 
   preConfigure = ''
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = ''
-    --disable-solaris --disable-udev --disable-jack --disable-bluez --localstatedir=/var
+    --disable-solaris --disable-hal --disable-jack --localstatedir=/var
+    --disable-oss-output --disable-oss-wrapper
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df07a54f7819..905657f89e2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6004,8 +6004,8 @@ let
 
   pulseaudio = makeOverridable (import ../servers/pulseaudio) {
     inherit fetchurl stdenv pkgconfig gnum4 gdbm
-      dbus hal avahi liboil libsamplerate libsndfile speex
-      intltool gettext libtool libcap;
+      dbus avahi liboil libsamplerate libsndfile speex
+      intltool gettext libtool libcap bluez udev;
     inherit (xlibs) libX11 libICE libSM libXtst libXi;
     inherit (gtkLibs) gtk glib;
     inherit alsaLib;    # Needs ALSA >= 1.0.17.