From 4b19a1980fee17065c732488a36a3db9d9447f1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:24:31 +0000
Subject: * Pulseaudio: disable the dependencies on GTK+, GConf and X11.  It's 
  not clear what they're good for, and we don't want other packages  
 depending on GTK+ or Gnome if it's not necessary.  Also, updated to   0.9.23.

svn path=/nixpkgs/branches/kde-4.7/; revision=27629
---
 pkgs/servers/pulseaudio/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'pkgs/servers/pulseaudio/default.nix')

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 40af6207243..6a525fd2a1b 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,25 +1,23 @@
 { 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 }:
 
 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";
+    url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz";
     sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll";
   };
 
   # 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
+    ];
 
   preConfigure = ''
     # Change the `padsp' script so that it contains the full path to
@@ -37,6 +35,8 @@ stdenv.mkDerivation rec {
     --disable-oss-output --disable-oss-wrapper
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "PulseAudio, a sound server for POSIX and Win32 systems";
 
-- 
cgit 1.4.1