From cb26e5a5d4f2566c7b2170fa66e114d17a66dca7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 22 Jan 2008 13:09:45 +0000 Subject: [PATCH] djvulibre: Qt3 frontend is optional svn path=/nixpkgs/branches/stdenv-updates/; revision=10241 --- pkgs/applications/misc/djvulibre/default.nix | 5 +---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 611f6f08909..e2082088fc9 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 735d216f00c..5c89c706aae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3794,7 +3794,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; };