From 1a29c7d7155f2d427aabf85c42fe5c53562982f5 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Thu, 6 Sep 2007 15:57:34 +0000
Subject: [PATCH] Added local hsqldb config line
 --with-hsqldb-jar=/lib/hsqldb.jar

svn path=/nixpkgs/trunk/; revision=9266
---
 pkgs/applications/office/openoffice/builder.sh  | 4 +++-
 pkgs/applications/office/openoffice/default.nix | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index 3234e366b902..fb60ed2d913d 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -1,11 +1,12 @@
 source $stdenv/setup
 
+echo $with_jdk_home
+
 export nodep=TRUE
 export NO_HIDS=TRUE
 
 export PATH=$icu/sbin:$PATH
 
-
 preConfigure=preConfigure
 preConfigure() {
     for i in \
@@ -75,3 +76,4 @@ installPhase() {
 
 
 genericBuild
+
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index c383a0a63df6..0f40a1470b58 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -2,10 +2,10 @@
 , perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre, cairo, which
-, icu, boost, jdk, ant
+, icu, boost, jdk, ant, hsqldb
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "openoffice.org-2.2.1";
   builder = ./builder.sh;
 
@@ -46,8 +46,11 @@ stdenv.mkDerivation {
     --without-system-xml-apis
     --without-system-xt
     --without-system-db
+    --with-hsqldb-jar=${hsqldb}/lib/hsqldb.jar
   ";
 
+  with_jdk_home = jdk;
+
   buildInputs = [
     pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib 
     libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl