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
parent 971337a119
commit b770365574
135 changed files with 2718 additions and 1591 deletions
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
  , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
-  , qt4, lzma
+  , qt4, lzma, gtk2
  , ...}:
 builderDefsPackage
 (a :