From a10b45e604cb06560f728556c7d2715f1f83495a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 5 Jul 2010 11:09:38 +0000 Subject: [PATCH] Don't build djview3 by default, let hydra build djview4 svn path=/nixpkgs/trunk/; revision=22474 --- pkgs/applications/graphics/djview/default.nix | 4 +++- pkgs/applications/misc/djvulibre/default.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 06438cc45f9..5ebb070ef1f 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,4 +1,4 @@ -args: with args; +{stdenv, fetchurl, djvulibre, qt4 }: stdenv.mkDerivation { name = "djview4-4.1-2"; @@ -13,5 +13,7 @@ stdenv.mkDerivation { homepage = http://djvu.sourceforge.net/djview4.html; description = "A new portable DjVu viewer and browser plugin"; license = "GPL2"; + inherit (qt4.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 0b052b094e2..0826f7241c4 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript +{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript , libungif, zlib, x11, libX11, mesa, qt3 }: stdenv.mkDerivation {