* Getting rid of gtk-libs by moving the packages in gtk-libs to

development/libraries/{glib,gtk+,pango,atk,...}.  Done for glib/gtk+
  1.2.  Also deleted some obsolete, unused versions (gtkLibs 2.10,
  2.12, and 2.14).

svn path=/nixpkgs/trunk/; revision=17992

pkgs/applications/networking/browsers/w3m/default.nix

@@ -1,11 +1,12 @@
 { stdenv, fetchurl
 , sslSupport ? true
 , graphicsSupport ? false
-, ncurses, openssl ? null, boehmgc, gettext, zlib, gdkpixbuf ? null
+, ncurses, openssl ? null, boehmgc, gettext, zlib
+, imlib2 ? null, x11 ? null
 }:
 
 assert sslSupport -> openssl != null;
-assert graphicsSupport -> gdkpixbuf != null;
+assert graphicsSupport -> x11 != null;
 
 stdenv.mkDerivation {
   name = "w3m-0.5.2";
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ncurses boehmgc gettext zlib]
     ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optional graphicsSupport gdkpixbuf;
+    ++ stdenv.lib.optionals graphicsSupport [imlib2 x11];
 
   configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}";