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

* libcanberra updated to 0.28. Disabled the gstreamer backend by

Browse Source 
default because there doesn't seem to be much point to it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27809
This commit is contained in:
Eelco Dolstra 2011-07-17 13:27:12 +00:00
parent f4ac1126ff
commit b6b4761dc6
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libcanberra/default.nix
View File

@ -1,19 +1,18 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk { stdenv, fetchurl, pkgconfig, libtool, gtk ? null
, alsaLib, pulseaudio, gstreamer, libvorbis, libcap }: , alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcanberra-0.23"; name = "libcanberra-0.28";
src = fetchurl { src = fetchurl {
url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz"; url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz";
sha256 = "0q09gasvm5dc9d4640lzb5nnmy2cpyi74aq83kjd3j4z58lczl57"; sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb";
}; };
buildInputs = buildInputs =
[ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap ]; [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ];
propagatedBuildInputs = [ gtk ];
configureFlags = "--disable-oss"; configureFlags = "--disable-oss --disable-schemas-install";
meta = { meta = {
description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications"; description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";

8
pkgs/top-level/all-packages.nix
View File

@ -3564,13 +3564,7 @@ let
libcaca = callPackage ../development/libraries/libcaca { }; libcaca = callPackage ../development/libraries/libcaca { };
libcanberra = callPackage ../development/libraries/libcanberra { libcanberra = callPackage ../development/libraries/libcanberra {
/* Using GNU Make 3.82 leads to this: # gstreamer = gst_all.gstreamer;
Makefile:939: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.
So use 3.81. */
stdenv = overrideInStdenv stdenv [gnumake381];
gstreamer = gst_all.gstreamer;
}; };
libcdaudio = callPackage ../development/libraries/libcdaudio { }; libcdaudio = callPackage ../development/libraries/libcdaudio { };