diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-12-02 23:21:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-12-02 23:21:40 +0000 |
| commit | db8da13e0d4289ea42466f1eb7b346687e39f7a1 (patch) | |
| tree | a8097a5cbe7f93ea4b6195fa38f42297e7049594 /pkgs | |
| parent | 6281842b45bc468c7b1762813feef82dea9d6932 (diff) | |
| download | nixpkgs-db8da13e0d4289ea42466f1eb7b346687e39f7a1.tar nixpkgs-db8da13e0d4289ea42466f1eb7b346687e39f7a1.tar.gz nixpkgs-db8da13e0d4289ea42466f1eb7b346687e39f7a1.tar.bz2 nixpkgs-db8da13e0d4289ea42466f1eb7b346687e39f7a1.tar.lz nixpkgs-db8da13e0d4289ea42466f1eb7b346687e39f7a1.tar.xz nixpkgs-db8da13e0d4289ea42466f1eb7b346687e39f7a1.tar.zst nixpkgs-db8da13e0d4289ea42466f1eb7b346687e39f7a1.zip | |
* Added t1lib, a library for Type 1 font support. Enabled it in xpdf.
svn path=/nixpkgs/trunk/; revision=4328
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/xpdf/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/t1lib/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 7 |
3 files changed, 23 insertions, 4 deletions
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 8ed6ffc8dcb..5ec7cba94b5 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,10 @@ -{ enableGUI ? true, enablePDFtoPPM ? true -, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null +{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true +, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null }: assert enableGUI -> x11 != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; +assert useT1Lib -> t1lib != null; stdenv.mkDerivation { name = "xpdf-3.01"; @@ -14,7 +15,9 @@ stdenv.mkDerivation { 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; configureFlags = "--enable-a4-paper"; /* We obey ISO standards! */ diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix new file mode 100644 index 00000000000..8fe560ab829 --- /dev/null +++ b/pkgs/development/libraries/t1lib/default.nix @@ -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"; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 4af87cab83c..ffedf80a35a 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1324,6 +1324,11 @@ rec { inherit (xlibs) libXp; }; + t1lib = (import ../development/libraries/t1lib) { + inherit fetchurl stdenv x11; + inherit (xlibs) libXaw; + }; + ### SERVERS @@ -1770,7 +1775,7 @@ rec { }; xpdf = (import ../applications/misc/xpdf) { - inherit fetchurl stdenv x11 freetype; + inherit fetchurl stdenv x11 freetype t1lib; motif = lesstif; }; |