Commit graph

3 commits

Author SHA1 Message Date
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 684f215b4f fix the problem of missing expat in a few packages 2013-02-11 18:34:40 +01:00
Cillian de Roiste cbded3238d Adding dbus-cplusplus, c++ bindings for dbus
svn path=/nixpkgs/trunk/; revision=33639
2012-04-05 23:53:20 +00:00