movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Don't depend on X unless djview3 is requested

Browse source 
Also rename option name to "qt3"

svn path=/nixpkgs/trunk/; revision=20908
This commit is contained in:
Yury G. Kudryashov 2010-04-01 12:34:50 +00:00
parent 1df704c533
commit f26e437b72
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/misc/djvulibre/default.nix
View file

@ -1,4 +1,5 @@
args: with args; { stdenv, fetchurl, lib, config, libjpeg, libtiff, libpng, ghostscript
, libungif, zlib, x11, libX11, mesa, qt3 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "djvulibre-3.5.22"; name = "djvulibre-3.5.22";
@ -8,10 +9,12 @@ stdenv.mkDerivation {
sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix"; sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix";
}; };
buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa]; buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
(if config "qt3" true then [qt3 libX11 x11 mesa] else []);
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";
homepage = http://djvu.sourceforge.net; homepage = http://djvu.sourceforge.net;
maintainers = [ lib.maintainers.urkud ];
}; };
} }

1
pkgs/lib/maintainers.nix
View file

@ -14,5 +14,6 @@
raskin = "Michael Raskin <7c6f434c@mail.ru>"; raskin = "Michael Raskin <7c6f434c@mail.ru>";
simons = "Peter Simons <simons@cryp.to>"; simons = "Peter Simons <simons@cryp.to>";
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
viric = "Lluís Batlle i Rossell <viriketo@gmail.com>"; viric = "Lluís Batlle i Rossell <viriketo@gmail.com>";
} }

6
pkgs/top-level/all-packages.nix
View file

@ -7072,9 +7072,9 @@ let
}; };
djvulibre = import ../applications/misc/djvulibre { djvulibre = import ../applications/misc/djvulibre {
inherit stdenv fetchurl libjpeg libtiff libungif zlib inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib
ghostscript libpng x11 mesa; ghostscript libpng mesa x11;
qt = if (getConfig ["djvulibre" "qt3Frontend"] true) then qt3 else null; config = getPkgConfig "djvulibre";
inherit (xlibs) libX11; inherit (xlibs) libX11;
}; };