From 22bc695075c8b3bc47d42548a81e58b466b4dc3d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" <urkud.urkud@gmail.com> Date: Sat, 10 Apr 2010 20:26:54 +0000 Subject: [PATCH] Use package overrides instead of getConfig svn path=/nixpkgs/trunk/; revision=21002 --- pkgs/applications/misc/djvulibre/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index e40accf8b447..0b052b094e26 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, config, libjpeg, libtiff, libpng, ghostscript +{ stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript , libungif, zlib, x11, libX11, mesa, qt3 }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++ - (if config "qt3" true then [qt3 libX11 x11 mesa] else []); + stdenv.lib.optionals useQt3 [qt3 libX11 x11 mesa]; meta = { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82f374907615..d11427e4078e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7045,10 +7045,9 @@ let inherit (gtkLibs) gtk glib; }; - djvulibre = import ../applications/misc/djvulibre { + djvulibre = makeOverridable (import ../applications/misc/djvulibre) { inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib ghostscript libpng mesa x11; - config = getPkgConfig "djvulibre"; inherit (xlibs) libX11; };