Don't depend on X unless djview3 is requested

Also rename option name to "qt3"

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

pkgs/applications/misc/djvulibre/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, lib, config, libjpeg, libtiff, libpng, ghostscript
+, libungif, zlib, x11, libX11, mesa, qt3 }:
 
 stdenv.mkDerivation {
   name = "djvulibre-3.5.22";
@@ -8,10 +9,12 @@ stdenv.mkDerivation {
     sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix";
   };
 
-  buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa];
+  buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
+    (if config "qt3" true then [qt3 libX11 x11 mesa] else []);
 
   meta = {
     description = "A library and viewer for the DJVU file format for scanned images";
     homepage = http://djvu.sourceforge.net;
+    maintainers = [ lib.maintainers.urkud ];
   };
 }

pkgs/lib/maintainers.nix

@@ -14,5 +14,6 @@
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
   simons = "Peter Simons <simons@cryp.to>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
+  urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   viric = "Lluís Batlle i Rossell <viriketo@gmail.com>";
 }

pkgs/top-level/all-packages.nix

@@ -7072,9 +7072,9 @@ let
   };
 
   djvulibre = import ../applications/misc/djvulibre {
-    inherit stdenv fetchurl libjpeg libtiff libungif zlib
-      ghostscript libpng x11 mesa;
-    qt = if (getConfig ["djvulibre" "qt3Frontend"] true) then qt3 else null;
+    inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib
+      ghostscript libpng mesa x11;
+    config = getPkgConfig "djvulibre";
     inherit (xlibs) libX11;
   };