From 656a12ef2e5dda8b6245bdc42af3e4ac955aa403 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 8 Jul 2008 08:28:07 +0000
Subject: [PATCH] small patch makes openoffice compile on x86_64
svn path=/nixpkgs/trunk/; revision=12320
---
pkgs/applications/office/openoffice/builder.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index 2a651a30058..fbe560e0fc5 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -22,7 +22,7 @@ preConfigure() {
postConfigure=postConfigure
postConfigure() {
cd ..
- for i in LinuxX86Env.Set LinuxX86Env.Set.sh; do
+ for i in LinuxX86*Env.Set; do
substituteInPlace $i --replace /usr /no-such-path
done
substituteInPlace solenv/inc/libs.mk \
@@ -33,7 +33,7 @@ postConfigure() {
buildPhase=buildPhase
buildPhase() {
- source LinuxX86Env.Set.sh
+ source LinuxX86*Env.Set.sh
./bootstrap
dmake # wait a few hours...
}