diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-09 13:58:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-09 14:03:35 +0200 |
| commit | ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde (patch) | |
| tree | 9bb0bc5ac4f3c6aaa170a9df5562f10e30ade47f /pkgs/development/libraries/libcanberra | |
| parent | 84b0bf63b7f07dc1d9d19458dcbba6d02b4e2811 (diff) | |
| download | nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.gz nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.bz2 nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.lz nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.xz nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.zst nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.zip | |
Revert Merge x-updates into master due to mesa bloat
See #490 discussion. This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)
Diffstat (limited to 'pkgs/development/libraries/libcanberra')
| -rw-r--r-- | pkgs/development/libraries/libcanberra/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index b57ea63fde7..691294d4a85 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null -, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }: +, alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }: stdenv.mkDerivation rec { - name = "libcanberra-0.30"; + name = "libcanberra-0.28"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.xz"; - sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; + url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz"; + sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb"; }; - buildInputs = # ToDo: gstreamer not found (why?), add (g)udev? - [ pkgconfig libtool alsaLib pulseaudio /*gstreamer gst_plugins_base*/ libvorbis gtk ]; + buildInputs = + [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ]; - configureFlags = "--disable-oss"; + configureFlags = "--disable-oss --disable-schemas-install"; meta = { - description = "An implementation of the XDG Sound Theme and Name Specifications"; + description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications"; longDescription = '' libcanberra is an implementation of the XDG Sound Theme and Name |