From 9fcb9035df0de0f355175462b76f27de948c98a4 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 30 Jan 2017 01:37:48 -0800 Subject: [PATCH] pulseaudio: 9.0 -> 10.0 dropped json_c as a dependency as it is no longer needed! patches are still needed for the caps fix and proper testing for TLS --- pkgs/servers/pulseaudio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 09be8c7c587..680c9dfcb60 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook -, json_c, libsndfile, libtool +, libsndfile, libtool , xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "9.0"; + version = "10.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3"; + sha256 = "0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653"; }; patches = [ ./caps-fix.patch ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ json_c libsndfile speexdsp fftwFloat ] + [ libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) (