about summary refs log tree commit diff
path: root/pkgs/applications/office/openoffice/default.nix
diff options
context:
space:
mode:
authorWouter den Breejen <uu@denbreejen.net>2007-09-06 15:57:34 +0000
committerWouter den Breejen <uu@denbreejen.net>2007-09-06 15:57:34 +0000
commit1a29c7d7155f2d427aabf85c42fe5c53562982f5 (patch)
treedee23792310a82e0cf2c9fa0e40f70963349f6ae /pkgs/applications/office/openoffice/default.nix
parentea579212506427656eecc86f2c8fbdf194a35f87 (diff)
downloadnixlib-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar
nixlib-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.gz
nixlib-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.bz2
nixlib-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.lz
nixlib-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.xz
nixlib-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.zst
nixlib-1a29c7d7155f2d427aabf85c42fe5c53562982f5.zip
Added local hsqldb config line --with-hsqldb-jar=/lib/hsqldb.jar
svn path=/nixpkgs/trunk/; revision=9266
Diffstat (limited to 'pkgs/applications/office/openoffice/default.nix')
-rw-r--r--pkgs/applications/office/openoffice/default.nix7
1 files changed, 5 insertions, 2 deletions
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