OpenOffice.org update attempt to 3.2.0 - maybe it will work

I'll wait for the hydra report.

svn path=/nixpkgs/trunk/; revision=21850

1 files changed, 14 insertions, 5 deletions

diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 2916a48efbfd..f1682f219758 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -6,7 +6,7 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
 }:
 
-let version = "3.1.1"; in
+let version = "3.2.0"; in
 stdenv.mkDerivation rec {
   name = "openoffice.org-${version}";
   builder = ./builder.sh;
@@ -17,16 +17,20 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
       url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
-      sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
+      sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml";
     };
 
-  patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ];
+  patches = [ ./oo.patch  ./root-required.patch ];
 
   src_system = fetchurl {
       url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2";
-      sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a";
+      sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp";
     };
 
+  preConfigure = ''
+    PATH=$PATH:${icu}/sbin
+  '';
+
   configureFlags = "
     --with-package-format=native
     --disable-epm
@@ -41,6 +45,7 @@ stdenv.mkDerivation rec {
     --with-system-libs
     --with-system-python
     --with-system-boost
+    --with-system-db
     --with-jdk-home=${jdk}
     --with-ant-home=${ant}
     --without-afms
@@ -56,7 +61,6 @@ stdenv.mkDerivation rec {
     --without-system-xerces
     --without-system-xml-apis
     --without-system-xt
-    --without-system-db
     --without-system-jars
     --without-system-hunspell
     --without-system-altlinuxhyph
@@ -64,6 +68,11 @@ stdenv.mkDerivation rec {
     --without-system-graphite
   ";
 
+  # Double make - I don't know why a single make reports error, and two, do not.
+  buildPhase = ''
+    make || make
+  '';
+
   LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
 
   buildInputs = [