* xpdf updated to 3.02pl1. Also patch its configuration file so that

it uses the Base-14 fonts from Ghostscript.

svn path=/nixpkgs/trunk/; revision=9396
This commit is contained in:
Eelco Dolstra 2007-10-03 12:16:48 +00:00
parent 2d9f1f42b6
commit 459b386ff9
2 changed files with 18 additions and 1 deletions

View file

@ -1,5 +1,6 @@
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true
, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null
, base14Fonts ? null
}:
assert enableGUI -> x11 != null && motif != null && freetype != null;
@ -7,7 +8,7 @@ assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null;
stdenv.mkDerivation {
name = "xpdf-3.02";
name = "xpdf-3.02pl1";
src = fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
@ -17,6 +18,13 @@ stdenv.mkDerivation {
buildInputs =
(if enableGUI then [x11 motif] else []) ++
(if useT1Lib then [t1lib] else []);
patches = [
(fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch;
sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq";
})
];
configureFlags =
[ "--enable-a4-paper" ] /* We obey ISO standards! */
@ -24,4 +32,12 @@ stdenv.mkDerivation {
"--with-freetype2-library=${freetype}/lib"
"--with-freetype2-includes=${freetype}/include/freetype2"
] else []);
postInstall = "
if test -n \"${base14Fonts}\"; then
substituteInPlace $out/etc/xpdfrc \\
--replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\
--replace '#displayFontT1' displayFontT1
fi
";
}

View file

@ -3901,6 +3901,7 @@ rec {
xpdf = import ../applications/misc/xpdf {
inherit fetchurl stdenv x11 freetype t1lib;
motif = lesstif;
base14Fonts = "${ghostscript}/share/ghostscript/fonts";
};
xterm = import ../applications/misc/xterm {