From 5dcb97fcc121d23669cda89525ec569d40edc44b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 28 Jan 2008 19:48:08 +0000 Subject: [PATCH] djvulibre: Qt3 frontend is optional svn path=/nixpkgs/trunk/; revision=10354 --- 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 edd36ae1e8c..eb505a5d979 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; };