1 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index a918007b47c..4228f8b1eab 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -3,25 +3,19 @@
 , bluez, sbc, udev, libcap, json_c
 , jackaudioSupport ? false, jack2 ? null
 , x11Support ? false, xlibs
-, useSystemd ? false, systemd ? null }:
+, useSystemd ? false, systemd ? null
+, ossWrapper ? false }:
 
 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 ];
@@ -45,9 +39,17 @@ stdenv.mkDerivation rec {
        -e "s|chmod r+s |true |"
   '';
 
-  configureFlags =
-    [ "--disable-solaris" "--disable-jack" "--disable-oss-output"
-      "--disable-oss-wrapper" "--localstatedir=/var" "--sysconfdir=/etc" ]
+  configureFlags = [
+    "--disable-solaris"
+    "--disable-jack"
+    "--disable-oss-output"
+  ] ++ stdenv.lib.optional (!ossWrapper) "--disable-oss-wrapper" ++
+  [
+    "--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=/";