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

ReRevert Merge x-updates into master

Browse Source 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Vladimír Čunát
2013-05-29 23:25:02 +02:00
parent 971337a119
commit b770365574
135 changed files with 2718 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libcanberra/default.nix
+8 -8
View File
@@ -1,25 +1,25 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null
, alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }:
, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }:
stdenv.mkDerivation rec {
name = "libcanberra-0.28";
name = "libcanberra-0.30";
src = fetchurl {
url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz";
sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb";
url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.xz";
sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
};
buildInputs =
[ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ];
buildInputs = # ToDo: gstreamer not found (why?), add (g)udev?
[ pkgconfig libtool alsaLib pulseaudio /*gstreamer gst_plugins_base*/ libvorbis gtk ];
configureFlags = "--disable-oss --disable-schemas-install";
configureFlags = "--disable-oss";
passthru = {
gtkModule = "/lib/gtk-2.0/";
};
meta = {
description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";
description = "An implementation of the XDG Sound Theme and Name Specifications";
longDescription = ''
libcanberra is an implementation of the XDG Sound Theme and Name