4 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
Michael Raskin	3c1ce85692	Fix ZBar build by passing it gtk2	2013-03-21 11:59:07 +04:00
Michael Raskin	dcf04b6063	zbar requires v4l1; disabe video	2013-03-09 12:59:45 +04:00
Michael Raskin	09114ea858	Adding ZBar ... svn path=/nixpkgs/trunk/; revision=29001	2011-09-04 09:12:00 +00:00