ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

pulseaudio: 5.0 -> 6.0

Browse Source
This commit is contained in:
William A. Kennington III 2015-03-25 22:08:17 -07:00
parent 5fab3e266e
commit 18e140701b
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/pulseaudio/default.nix
View File

@ -9,20 +9,13 @@
assert jackaudioSupport -> jack2 != null; assert jackaudioSupport -> jack2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pulseaudio-5.0"; name = "pulseaudio-6.0";
src = fetchurl { src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.xz"; 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. # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
propagatedBuildInputs propagatedBuildInputs
= [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
@ -55,6 +48,7 @@ stdenv.mkDerivation rec {
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-access-group=audio" "--with-access-group=audio"
"--with-systemduserunitdir=\${out}/lib/systemd/user"
] ]
++ stdenv.lib.optional jackaudioSupport "--enable-jack" ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/"; ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";

2
pkgs/top-level/all-packages.nix
View File

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