forked from mirrors/nixpkgs
Use package overrides instead of getConfig
svn path=/nixpkgs/trunk/; revision=21002
This commit is contained in:
parent
9cef0c7941
commit
22bc695075
pkgs
|
@ -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 }:
|
, libungif, zlib, x11, libX11, mesa, qt3 }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
|
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 = {
|
meta = {
|
||||||
description = "A library and viewer for the DJVU file format for scanned images";
|
description = "A library and viewer for the DJVU file format for scanned images";
|
||||||
|
|
|
@ -7045,10 +7045,9 @@ let
|
||||||
inherit (gtkLibs) gtk glib;
|
inherit (gtkLibs) gtk glib;
|
||||||
};
|
};
|
||||||
|
|
||||||
djvulibre = import ../applications/misc/djvulibre {
|
djvulibre = makeOverridable (import ../applications/misc/djvulibre) {
|
||||||
inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib
|
inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib
|
||||||
ghostscript libpng mesa x11;
|
ghostscript libpng mesa x11;
|
||||||
config = getPkgConfig "djvulibre";
|
|
||||||
inherit (xlibs) libX11;
|
inherit (xlibs) libX11;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue