diff options
| author | Domen Kožar <domen@dev.si> | 2013-06-29 07:57:18 -0700 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2013-06-29 07:57:18 -0700 |
| commit | 26e9afaa282a534f25fd0b028724987c7c0440bd (patch) | |
| tree | cedc7187244fc2d55fe9c477515ed9904597553e /pkgs/servers | |
| parent | 7c74edc9bca4c19dc625b3900e82a8e4bb19a489 (diff) | |
| parent | dbda1a29890d67558db712bc878d03a12703ff50 (diff) | |
| download | nixpkgs-26e9afaa282a534f25fd0b028724987c7c0440bd.tar nixpkgs-26e9afaa282a534f25fd0b028724987c7c0440bd.tar.gz nixpkgs-26e9afaa282a534f25fd0b028724987c7c0440bd.tar.bz2 nixpkgs-26e9afaa282a534f25fd0b028724987c7c0440bd.tar.lz nixpkgs-26e9afaa282a534f25fd0b028724987c7c0440bd.tar.xz nixpkgs-26e9afaa282a534f25fd0b028724987c7c0440bd.tar.zst nixpkgs-26e9afaa282a534f25fd0b028724987c7c0440bd.zip | |
Merge pull request #658 from aristidb/master
Pulseaudio 4.0 (and sbc 1.1)
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e315f788904..e78dc7b5dec 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,19 +10,19 @@ 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. - propagatedBuildInputs = [ gdbm ]; + # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated. + propagatedBuildInputs = [ gdbm libcap ]; buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi - libsamplerate libsndfile speex alsaLib bluez udev + libsamplerate libsndfile speex alsaLib bluez sbc udev json_c #gtk gconf ] |