Added local hsqldb config line --with-hsqldb-jar=/lib/hsqldb.jar

svn path=/nixpkgs/trunk/; revision=9266
This commit is contained in:
Wouter den Breejen 2007-09-06 15:57:34 +00:00
parent ea57921250
commit 1a29c7d715
2 changed files with 8 additions and 3 deletions

View File

@ -1,11 +1,12 @@
source $stdenv/setup source $stdenv/setup
echo $with_jdk_home
export nodep=TRUE export nodep=TRUE
export NO_HIDS=TRUE export NO_HIDS=TRUE
export PATH=$icu/sbin:$PATH export PATH=$icu/sbin:$PATH
preConfigure=preConfigure preConfigure=preConfigure
preConfigure() { preConfigure() {
for i in \ for i in \
@ -75,3 +76,4 @@ installPhase() {
genericBuild genericBuild

View File

@ -2,10 +2,10 @@
, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd , perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre, cairo, which , 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"; name = "openoffice.org-2.2.1";
builder = ./builder.sh; builder = ./builder.sh;
@ -46,8 +46,11 @@ stdenv.mkDerivation {
--without-system-xml-apis --without-system-xml-apis
--without-system-xt --without-system-xt
--without-system-db --without-system-db
--with-hsqldb-jar=${hsqldb}/lib/hsqldb.jar
"; ";
with_jdk_home = jdk;
buildInputs = [ buildInputs = [
pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl