pulseaudio: 5.0 -> 6.0

pkgs/servers/pulseaudio/default.nix

@@ -9,20 +9,13 @@
 assert jackaudioSupport -> jack2 != null;
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-5.0";
+  name = "pulseaudio-6.0";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.xz";
-    sha256 = "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr";
+    sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm";
   };
 
-  patches = [(fetchpatch {
-    name = "CVE-2014-3970.patch";
-    url = "http://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/"
-      + "?id=26b9d22dd24c17eb118d0205bf7b02b75d435e3c";
-    sha256 = "13vxp6520djgfrfxkzy5qvabl94sga3yl5pj93xawbkgwzqymdyq";
-  })];
-
   # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
   propagatedBuildInputs
     = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
@@ -55,6 +48,7 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--with-access-group=audio"
+    "--with-systemduserunitdir=\${out}/lib/systemd/user"
   ]
     ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
     ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";

pkgs/top-level/all-packages.nix

@@ -8299,11 +8299,13 @@ let
     bluez = null;
     avahi = null;
   };
+
   pulseaudioFull = pulseaudio.override {
     bluez = bluez5;
     avahi = avahi;
     jackaudioSupport = true;
     x11Support = true;
+    useSystemd = stdenv.isLinux;
   };
 
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };