From 0ff12ea30bed2dac13bdc4b7fef3f50925afe5de Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Wed, 19 May 2010 16:46:48 +0000
Subject: Trying to fix the build of openoffice 3.2.0

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

diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index 848afe962109..131e85de5bf6 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -33,7 +33,8 @@ postConfigure() {
 buildPhase() {
     source LinuxX86*Env.Set.sh
     ./bootstrap
-    dmake # wait a few hours...
+    # bootstrap defines the alias 'build', that mostly runs this perl script:
+    (cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores
 }
 
 wrapSOffice() {
@@ -57,6 +58,7 @@ installPhase() {
     ooFiles=$out/lib/openoffice
 
     # This was all borrowed from ooo-build-2.2.1's bin/ooinstall.
+    # This needs the ./bootstrap having run in the buildPhase to get some env vars.
     eval $(grep 'BUILD\|LAST_MINOR' $SOLARENV/inc/minor.mk)
     export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH 
     export OUT=../$INPATH
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 5c1e34a4425c..9c8b7cdb3626 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -67,11 +67,6 @@ 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 = [
-- 
cgit 1.4.1