* Added Lesstif (a Motif clone).

* Enabled the actual xpdf GUI in xpdf.

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

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

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! */
 }

pkgs/development/libraries/lesstif/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, x11, libXp}:
+
+stdenv.mkDerivation {
+  name = "lesstif-0.94.4";
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/lesstif/lesstif-0.94.4.tar.bz2;
+    md5 = "3096ca456c0bc299d895974d307c82d8";
+  };
+  buildInputs = [x11];
+  propagatedBuildInputs = [libXp];
+}

pkgs/system/all-packages-generic.nix

@@ -1319,6 +1319,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  lesstif = (import ../development/libraries/lesstif) {
+    inherit fetchurl stdenv x11;
+    inherit (xlibs) libXp;
+  };
+
   
   ### SERVERS
 
@@ -1765,8 +1770,8 @@ rec {
   };
 
   xpdf = (import ../applications/misc/xpdf) {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv x11 freetype;
-    inherit (xlibs) libX11;
+    motif = lesstif;
   };
 
   acroread = (import ../applications/misc/acrobat-reader) {