Merge pull request #22398 from MP2E/pulse_update

pulseaudio: 9.0 -> 10.0
This commit is contained in:
Benjamin Staffin 2017-02-03 02:35:21 -05:00 committed by GitHub
commit 3d543cb82a

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook { lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook
, json_c, libsndfile, libtool , libsndfile, libtool
, xorg, libcap, alsaLib, glib , xorg, libcap, alsaLib, glib
, avahi, libjack2, libasyncns, lirc, dbus , avahi, libjack2, libasyncns, lirc, dbus
, sbc, bluez5, udev, openssl, fftwFloat , sbc, bluez5, udev, openssl, fftwFloat
@ -36,11 +36,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
version = "9.0"; version = "10.0";
src = fetchurl { src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3"; sha256 = "0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653";
}; };
patches = [ ./caps-fix.patch ] patches = [ ./caps-fix.patch ]
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
lib.optionals stdenv.isLinux [ libcap ]; lib.optionals stdenv.isLinux [ libcap ];
buildInputs = buildInputs =
[ json_c libsndfile speexdsp fftwFloat ] [ libsndfile speexdsp fftwFloat ]
++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isLinux [ glib dbus ]
++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ]
++ lib.optionals (!libOnly) ( ++ lib.optionals (!libOnly) (