From ff894ae7736b8916412622b06ecfc42d9af87819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Apr 2009 13:51:31 +0000 Subject: [PATCH] Fixing the openoffice build, to run with a single job. svn path=/nixpkgs/trunk/; revision=15182 --- pkgs/applications/office/openoffice/builder.sh | 1 - .../office/openoffice/ooo-libtextcat.patch | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 pkgs/applications/office/openoffice/ooo-libtextcat.patch diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index c3df7c3899d6..0c8ebc851390 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -39,7 +39,6 @@ postConfigure() { buildPhase=buildPhase buildPhase() { source LinuxX86*Env.Set.sh - export JOBS=2 ./bootstrap dmake # wait a few hours... } diff --git a/pkgs/applications/office/openoffice/ooo-libtextcat.patch b/pkgs/applications/office/openoffice/ooo-libtextcat.patch deleted file mode 100644 index 6fe7b7108c33..000000000000 --- a/pkgs/applications/office/openoffice/ooo-libtextcat.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- OOH680_m17/libtextcat/makefile.mk 2008-01-02 18:33:39.000000000 +0100 -+++ OOH680_m17/libtextcat/makefile.mk 2008-08-14 15:52:19.000000000 +0200 -@@ -62,6 +62,6 @@ ADDITIONAL_FILES= \ - - #relative to CONFIGURE_DIR - CONFIGURE_ACTION=configure CFLAGS="$(EXTRA_CFLAGS)" --CONFIGURE_FLAGS= -+CONFIGURE_FLAGS=--prefix="${out}" - - BUILD_ACTION=make