summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-28 19:48:08 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-28 19:48:08 +0000
commit5dcb97fcc121d23669cda89525ec569d40edc44b (patch)
tree631084ff3071c2dc0070a92fb80352792428e9f1
parent3386eea6c0ff74d18b3f3e1f50ac9d2e63af3976 (diff)
downloadnixlib-5dcb97fcc121d23669cda89525ec569d40edc44b.tar
nixlib-5dcb97fcc121d23669cda89525ec569d40edc44b.tar.gz
nixlib-5dcb97fcc121d23669cda89525ec569d40edc44b.tar.bz2
nixlib-5dcb97fcc121d23669cda89525ec569d40edc44b.tar.lz
nixlib-5dcb97fcc121d23669cda89525ec569d40edc44b.tar.xz
nixlib-5dcb97fcc121d23669cda89525ec569d40edc44b.tar.zst
nixlib-5dcb97fcc121d23669cda89525ec569d40edc44b.zip
djvulibre: Qt3 frontend is optional
svn path=/nixpkgs/trunk/; revision=10354
-rw-r--r--pkgs/applications/misc/djvulibre/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 611f6f08909a..e2082088fc99 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -1,7 +1,4 @@
-{stdenv, fetchurl,
-qt, libX11, libjpeg, libtiff, libpng, ghostscript, zlib, libungif,
-x11, mesa
-}:
+args: with args;
 stdenv.mkDerivation {
   name = "djvulibre-3.5.19";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edd36ae1e8c5..eb505a5d979f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4137,7 +4137,7 @@ rec {
   djvulibre = import ../applications/misc/djvulibre {
     inherit stdenv fetchurl libjpeg libtiff libungif zlib
 	ghostscript libpng x11 mesa;
-    qt = qt3;
+    qt = if (getConfig ["djvulibre" "qt3Frontend"] true) then qt3 else null;
     inherit (xlibs) libX11;
   };