public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #658 from aristidb/master

Browse Source 
Pulseaudio 4.0 (and sbc 1.1)
This commit is contained in:
Domen Kožar 2013-06-29 07:57:18 -07:00
commit 26e9afaa28
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/sbc/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libsndfile, pkgconfig }: { stdenv, fetchurl, libsndfile, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sbc-1.0"; name = "sbc-1.1";
src = fetchurl { src = fetchurl {
url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz"; url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
sha256 = "10mq2rmh3h90bwq5cdcmizf93zf8f2br8gds0jxr9i962ai0m5xz"; sha256 = "1ipvkhilyhdbd2nzq0la6l7q361l0zm0c6kvga2a0y89q8nssc4s";
}; };
buildInputs = [ pkgconfig libsndfile ]; buildInputs = [ pkgconfig libsndfile ];

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
, gconf, gtk, intltool, gettext , gconf, gtk, intltool, gettext
, alsaLib, libsamplerate, libsndfile, speex, bluez, udev , alsaLib, libsamplerate, libsndfile, speex, bluez, sbc, udev, libcap
, jackaudioSupport ? false, jackaudio ? null , jackaudioSupport ? false, jackaudio ? null
, x11Support ? false, xlibs , x11Support ? false, xlibs
, json_c , json_c
@ -10,19 +10,19 @@
assert jackaudioSupport -> jackaudio != null; assert jackaudioSupport -> jackaudio != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pulseaudio-2.1"; name = "pulseaudio-4.0";
src = fetchurl { src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz"; url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-4.0.tar.xz";
sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg"; sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim";
}; };
# Since `libpulse*.la' contain `-lgdbm', it must be propagated. # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
propagatedBuildInputs = [ gdbm ]; propagatedBuildInputs = [ gdbm libcap ];
buildInputs = buildInputs =
[ pkgconfig gnum4 libtool intltool glib dbus avahi [ pkgconfig gnum4 libtool intltool glib dbus avahi
libsamplerate libsndfile speex alsaLib bluez udev libsamplerate libsndfile speex alsaLib bluez sbc udev
json_c json_c
#gtk gconf #gtk gconf
] ]