* Sync with the trunc.

* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023

1 files changed, 8 insertions, 3 deletions

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 5219118963c7..41c819cbe3fa 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,13 +1,16 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
-, alsaLib, libsamplerate, libsndfile, speex, bluez, udev }:
+, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
+, jackaudioSupport ? false, jackaudio ? null }:
+
+assert jackaudioSupport -> jackaudio != null;
 
 stdenv.mkDerivation rec {
   name = "pulseaudio-0.9.23";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz";
-    sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll";
+    sha256 = "0kms3w1i48j9368amr8wv83gk4szrnglh1biyp8jyqyb2k388gmg";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@@ -17,7 +20,8 @@ stdenv.mkDerivation rec {
     [ 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
@@ -34,6 +38,7 @@ stdenv.mkDerivation rec {
     --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";