diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-01 12:34:50 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-01 12:34:50 +0000 |
commit | f26e437b72a35951471c2ca8609c0cee7560449c (patch) | |
tree | 2537180f8dfb48afc8dde2ff67ed9eb989d72b8b | |
parent | 1df704c53341f16d0d1a55b0cddd4b82b4492a01 (diff) | |
download | nixlib-f26e437b72a35951471c2ca8609c0cee7560449c.tar nixlib-f26e437b72a35951471c2ca8609c0cee7560449c.tar.gz nixlib-f26e437b72a35951471c2ca8609c0cee7560449c.tar.bz2 nixlib-f26e437b72a35951471c2ca8609c0cee7560449c.tar.lz nixlib-f26e437b72a35951471c2ca8609c0cee7560449c.tar.xz nixlib-f26e437b72a35951471c2ca8609c0cee7560449c.tar.zst nixlib-f26e437b72a35951471c2ca8609c0cee7560449c.zip |
Don't depend on X unless djview3 is requested
Also rename option name to "qt3" svn path=/nixpkgs/trunk/; revision=20908
-rw-r--r-- | pkgs/applications/misc/djvulibre/default.nix | 7 | ||||
-rw-r--r-- | pkgs/lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 59c4552b7b36..e40accf8b447 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, lib, config, libjpeg, libtiff, libpng, ghostscript +, libungif, zlib, x11, libX11, mesa, qt3 }: stdenv.mkDerivation { name = "djvulibre-3.5.22"; @@ -8,10 +9,12 @@ stdenv.mkDerivation { 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 = { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; + maintainers = [ lib.maintainers.urkud ]; }; } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 191930f9ceb6..678c061eb87e 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -14,5 +14,6 @@ raskin = "Michael Raskin <7c6f434c@mail.ru>"; simons = "Peter Simons <simons@cryp.to>"; 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>"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c459fc1bc744..4302b45dc4bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7072,9 +7072,9 @@ let }; djvulibre = import ../applications/misc/djvulibre { - inherit stdenv fetchurl libjpeg libtiff libungif zlib - ghostscript libpng x11 mesa; - qt = if (getConfig ["djvulibre" "qt3Frontend"] true) then qt3 else null; + inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib + ghostscript libpng mesa x11; + config = getPkgConfig "djvulibre"; inherit (xlibs) libX11; }; |