diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:28:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:30:53 +0200 |
| commit | 625f40151b0767cb421999cf988f4eb7bcf8b63d (patch) | |
| tree | 629565f6f9efb26ad36b2a6d8e7e266290feb94b /pkgs/servers/pulseaudio | |
| parent | d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 (diff) | |
| parent | 4fb87e91ffcbf6f6785e32b7e608198401a7155d (diff) | |
| download | nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.gz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.bz2 nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.lz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.xz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.zst nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.zip | |
Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/servers/pulseaudio')
| -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 e315f7889040..e78dc7b5dece 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 ] |