* Added Lesstif (a Motif clone).

* Enabled the actual xpdf GUI in xpdf.

svn path=/nixpkgs/trunk/; revision=4327

2 files changed, 18 insertions, 3 deletions

diff --git a/pkgs/applications/misc/xpdf/builder.sh b/pkgs/applications/misc/xpdf/builder.sh
index cb01b4e35299..a7fd6a6a51ea 100644
--- a/pkgs/applications/misc/xpdf/builder.sh
+++ b/pkgs/applications/misc/xpdf/builder.sh
@@ -1,5 +1,10 @@
 source $stdenv/setup
 
-configureFlags="--x-includes=$libX11/include --x-libraries=$libX11/lib"
+if test -n "$freetype"; then
+    configureFlags="\
+      --with-freetype2-library=$freetype/lib \
+      --with-freetype2-includes=$freetype/include/freetype2 \
+      $configureFlags"
+fi
 
 genericBuild
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 239c1a186a7e..8ed6ffc8dcba 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -1,11 +1,21 @@
-{stdenv, fetchurl, libX11}:
+{ enableGUI ? true, enablePDFtoPPM ? true
+, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null
+}:
+
+assert enableGUI -> x11 != null && motif != null && freetype != null;
+assert enablePDFtoPPM -> freetype != null;
 
 stdenv.mkDerivation {
   name = "xpdf-3.01";
   builder = ./builder.sh;
+
   src = fetchurl {
     url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.01.tar.gz;
     md5 = "e004c69c7dddef165d768b1362b44268";
   };
-  inherit libX11;
+  
+  buildInputs = (if enableGUI then [x11 motif] else []);
+  freetype = if enableGUI || enablePDFtoPPM then freetype else null;
+    
+  configureFlags = "--enable-a4-paper"; /* We obey ISO standards! */
 }