diff options
| author | Wouter den Breejen <uu@denbreejen.net> | 2007-09-06 15:57:34 +0000 |
|---|---|---|
| committer | Wouter den Breejen <uu@denbreejen.net> | 2007-09-06 15:57:34 +0000 |
| commit | 1a29c7d7155f2d427aabf85c42fe5c53562982f5 (patch) | |
| tree | dee23792310a82e0cf2c9fa0e40f70963349f6ae /pkgs/applications/office | |
| parent | ea579212506427656eecc86f2c8fbdf194a35f87 (diff) | |
| download | nixpkgs-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar nixpkgs-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.gz nixpkgs-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.bz2 nixpkgs-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.lz nixpkgs-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.xz nixpkgs-1a29c7d7155f2d427aabf85c42fe5c53562982f5.tar.zst nixpkgs-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')
| -rw-r--r-- | pkgs/applications/office/openoffice/builder.sh | 4 | ||||
| -rw-r--r-- | 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 3234e366b90..fb60ed2d913 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 c383a0a63df..0f40a1470b5 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 |