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

Revert Merge x-updates into master due to mesa bloat

Browse Source 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
This commit is contained in:
Vladimír Čunát
2013-05-09 14:03:35 +02:00
parent 84b0bf63b7
commit ec3965d8d0
135 changed files with 1595 additions and 2722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libcanberra/default.nix
+8 -8
View File
@@ -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