From 6281842b45bc468c7b1762813feef82dea9d6932 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Dec 2005 22:49:51 +0000
Subject: [PATCH] * Added Lesstif (a Motif clone). * Enabled the actual xpdf
 GUI in xpdf.

svn path=/nixpkgs/trunk/; revision=4327
---
 pkgs/applications/misc/xpdf/builder.sh         |  7 ++++++-
 pkgs/applications/misc/xpdf/default.nix        | 14 ++++++++++++--
 pkgs/development/libraries/lesstif/default.nix | 11 +++++++++++
 pkgs/system/all-packages-generic.nix           |  9 +++++++--
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/lesstif/default.nix

diff --git a/pkgs/applications/misc/xpdf/builder.sh b/pkgs/applications/misc/xpdf/builder.sh
index cb01b4e3529..a7fd6a6a51e 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 239c1a186a7..8ed6ffc8dcb 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! */
 }
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
new file mode 100644
index 00000000000..8da6090e356
--- /dev/null
+++ b/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];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f00304e49a1..4af87cab83c 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/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 (xlibs) libX11;
+    inherit fetchurl stdenv x11 freetype;
+    motif = lesstif;
   };
 
   acroread = (import ../applications/misc/acrobat-reader) {