From 9cf98d31f77a0acb1c8488536d2ae70bceb01f9f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 26 Oct 2005 20:42:12 +0000
Subject: [PATCH] we need getopt too

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

diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index d0c9a59f7fb5..c2bba1ff41f8 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -3,8 +3,17 @@ source $stdenv/setup
 configurePhase() {
   cd config_office/;
   ./configure --disable-epm --disable-odk --with-java=no --disable-cups --with-system-libs --with-system-python --disable-mozilla --without-nas --disable-pasf --disable-gnome-vfs;
+  cd ..
 }
 
-configurePhase=configurePhase;
+configurePhase=configurePhase
+
+buildPhase() {
+  ./bootstrap
+  source LinuxIntelEnv.Set.sh 
+  dmake
+}
+
+buildPhase=buildPhase
 
 genericBuild
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index d8fe537ad3e0..39b0701d9d60 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon, bison, flex, zip, gtk, libmspack}:
+{stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon, bison, flex, zip, gtk, libmspack, getopt}:
 
 stdenv.mkDerivation {
   name = "openoffice.org-2.0.0";
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.0.0/OOo_2.0.0_src.tar.gz;
     md5 = "a68933afc2bf432d11b2043ac99ba0aa";
   };
-  buildInputs = [pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip gtk libmspack];
+  buildInputs = [pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip gtk libmspack getopt];
 }