Author: eelco
Date: Sun Jul 17 13:27:12 2011
New Revision: 27809
URL: https://svn.nixos.org/websvn/nix/?rev=27809&sc=1
Log:
* libcanberra updated to 0.28. Disabled the gstreamer backend by
default because there doesn't seem to be much point to it.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/libcanberra/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/libcanberra/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/libcanberra/default.nix
Sun Jul 17 12:02:20 2011 (r27808)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/libcanberra/default.nix
Sun Jul 17 13:27:12 2011 (r27809)
@@ -1,19 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk
-, alsaLib, pulseaudio, gstreamer, libvorbis, libcap }:
+{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null
+, alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }:
stdenv.mkDerivation rec {
- name = "libcanberra-0.23";
+ name = "libcanberra-0.28";
src = fetchurl {
url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz";;
- sha256 = "0q09gasvm5dc9d4640lzb5nnmy2cpyi74aq83kjd3j4z58lczl57";
+ sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb";
};
buildInputs =
- [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap ];
- propagatedBuildInputs = [ gtk ];
+ [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ];
- configureFlags = "--disable-oss";
+ configureFlags = "--disable-oss --disable-schemas-install";
meta = {
description = "libcanberra, an implementation of the XDG Sound Theme and
Name Specifications";
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Sun Jul 17
12:02:20 2011 (r27808)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Sun Jul 17
13:27:12 2011 (r27809)
@@ -3564,13 +3564,7 @@
libcaca = callPackage ../development/libraries/libcaca { };
libcanberra = callPackage ../development/libraries/libcanberra {
- /* Using GNU Make 3.82 leads to this:
-
- 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;
+ # gstreamer = gst_all.gstreamer;
};
libcdaudio = callPackage ../development/libraries/libcdaudio { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
