Commit Graph

10 Commits

Author SHA1 Message Date
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
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
2013-05-29 23:25:02 +02:00
Jaka Hudoklin
09f342edc9 firefoxWrapper: Add libcanberra gtk module to firefox 2013-05-10 00:44:03 +00:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
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)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
74e0c25ec8 libcanberra: update, streamline dependencies
Still some ToDos but should be OK, tested building some
reverse-dependencies.
2013-02-21 21:26:36 +01:00
Eelco Dolstra
b6b4761dc6 * libcanberra updated to 0.28. Disabled the gstreamer backend by
default because there doesn't seem to be much point to it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27809
2011-07-17 13:27:12 +00:00
Ludovic Courtès
4a909f0838 libcanberra: Remove useless ‘gthread’ argument.
svn path=/nixpkgs/trunk/; revision=23226
2010-08-18 14:27:04 +00:00
Ludovic Courtès
344f2efc5f libcanberra 0.23.
svn path=/nixpkgs/trunk/; revision=20353
2010-03-03 14:27:17 +00:00
Ludovic Courtès
723dfe4240 libcanberra: Make GTK+ a propagated build input.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14881
2009-04-04 13:53:07 +00:00
Ludovic Courtès
7137c6dea8 libcanberra: Use the right GTK+ version, use GThread as well, disable OSS support (recommended).
svn path=/nixpkgs/trunk/; revision=13822
2009-01-22 22:34:06 +00:00
Ludovic Courtès
269f914ab7 Add `libcanberra'.
svn path=/nixpkgs/trunk/; revision=13814
2009-01-20 09:50:15 +00:00