From ad06d4df18a9f0c081e79139803bd45fbcc82486 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 20 Jun 2013 22:48:35 +0200
Subject: [PATCH] update pulseaudio to 4.0 and sbc to 1.1
---
pkgs/development/libraries/sbc/default.nix | 4 ++--
pkgs/servers/pulseaudio/default.nix | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index d621eed6728..12662b9dea9 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libsndfile, pkgconfig }:
stdenv.mkDerivation rec {
- name = "sbc-1.0";
+ name = "sbc-1.1";
src = fetchurl {
url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
- sha256 = "10mq2rmh3h90bwq5cdcmizf93zf8f2br8gds0jxr9i962ai0m5xz";
+ sha256 = "1ipvkhilyhdbd2nzq0la6l7q361l0zm0c6kvga2a0y89q8nssc4s";
};
buildInputs = [ pkgconfig libsndfile ];
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index e315f788904..04318a792e8 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
, gconf, gtk, intltool, gettext
-, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
+, alsaLib, libsamplerate, libsndfile, speex, bluez, sbc, udev, libcap
, jackaudioSupport ? false, jackaudio ? null
, x11Support ? false, xlibs
, json_c
@@ -10,11 +10,11 @@
assert jackaudioSupport -> jackaudio != null;
stdenv.mkDerivation rec {
- name = "pulseaudio-2.1";
+ name = "pulseaudio-4.0";
src = fetchurl {
- url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz";
- sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg";
+ url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-4.0.tar.xz";
+ sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim";
};
# Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig gnum4 libtool intltool glib dbus avahi
- libsamplerate libsndfile speex alsaLib bluez udev
- json_c
+ libsamplerate libsndfile speex alsaLib bluez sbc udev
+ json_c libcap
#gtk gconf
]
++ stdenv.lib.optional jackaudioSupport jackaudio