* Added t1lib, a library for Type 1 font support. Enabled it in xpdf.
svn path=/nixpkgs/trunk/; revision=4328
This commit is contained in:
parent
6281842b45
commit
db8da13e0d
@ -1,9 +1,10 @@
|
|||||||
{ enableGUI ? true, enablePDFtoPPM ? true
|
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true
|
||||||
, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null
|
, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert enableGUI -> x11 != null && motif != null && freetype != null;
|
assert enableGUI -> x11 != null && motif != null && freetype != null;
|
||||||
assert enablePDFtoPPM -> freetype != null;
|
assert enablePDFtoPPM -> freetype != null;
|
||||||
|
assert useT1Lib -> t1lib != null;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "xpdf-3.01";
|
name = "xpdf-3.01";
|
||||||
@ -14,7 +15,9 @@ stdenv.mkDerivation {
|
|||||||
md5 = "e004c69c7dddef165d768b1362b44268";
|
md5 = "e004c69c7dddef165d768b1362b44268";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = (if enableGUI then [x11 motif] else []);
|
buildInputs =
|
||||||
|
(if enableGUI then [x11 motif] else []) ++
|
||||||
|
(if useT1Lib then [t1lib] else []);
|
||||||
freetype = if enableGUI || enablePDFtoPPM then freetype else null;
|
freetype = if enableGUI || enablePDFtoPPM then freetype else null;
|
||||||
|
|
||||||
configureFlags = "--enable-a4-paper"; /* We obey ISO standards! */
|
configureFlags = "--enable-a4-paper"; /* We obey ISO standards! */
|
||||||
|
11
pkgs/development/libraries/t1lib/default.nix
Normal file
11
pkgs/development/libraries/t1lib/default.nix
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{stdenv, fetchurl, x11, libXaw}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "t1lib-5.1.0";
|
||||||
|
src = fetchurl {
|
||||||
|
url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.0.tar.gz;
|
||||||
|
md5 = "a05bed4aa63637052e60690ccde70421";
|
||||||
|
};
|
||||||
|
buildInputs = [x11 libXaw];
|
||||||
|
makeFlags = "without_doc";
|
||||||
|
}
|
@ -1324,6 +1324,11 @@ rec {
|
|||||||
inherit (xlibs) libXp;
|
inherit (xlibs) libXp;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
t1lib = (import ../development/libraries/t1lib) {
|
||||||
|
inherit fetchurl stdenv x11;
|
||||||
|
inherit (xlibs) libXaw;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
### SERVERS
|
### SERVERS
|
||||||
|
|
||||||
@ -1770,7 +1775,7 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
xpdf = (import ../applications/misc/xpdf) {
|
xpdf = (import ../applications/misc/xpdf) {
|
||||||
inherit fetchurl stdenv x11 freetype;
|
inherit fetchurl stdenv x11 freetype t1lib;
|
||||||
motif = lesstif;
|
motif = lesstif;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user