diff options
author | William A. Kennington III <william@wkennington.com> | 2015-03-25 22:08:17 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-03-25 22:10:47 -0700 |
commit | 18e140701bc1496b78759991214061e7c3d68f1a (patch) | |
tree | 47fc34e41559c44770819584ca121b3dca49e703 /pkgs/servers/pulseaudio/default.nix | |
parent | 5fab3e266e643abb588f015cf4cf1055d8a936d5 (diff) |
pulseaudio: 5.0 -> 6.0
Diffstat (limited to 'pkgs/servers/pulseaudio/default.nix')
-rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 5e0bc4f60f1ba..4228f8b1eab34 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/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=/"; |