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

Revert Merge x-updates into master due to mesa bloat

Browse Source 
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)
This commit is contained in:
Vladimír Čunát
2013-05-09 14:03:35 +02:00
parent 84b0bf63b7
commit ec3965d8d0
135 changed files with 1595 additions and 2722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/zbar/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
x@{builderDefsPackage
, imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
, qt4, lzma, gtk2
, qt4, lzma
, ...}:
builderDefsPackage
(a :