diff options
author | Lluís Batlle i Rossell | 2009-04-20 13:51:31 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell | 2009-04-20 13:51:31 +0000 |
commit | ff894ae7736b8916412622b06ecfc42d9af87819 (patch) | |
tree | 98ce7917afc9498eb930cb068a69e07e58eb5577 | |
parent | fc3574b125bb534b48317f7f239d2f3199f489cb (diff) |
Fixing the openoffice build, to run with a single job.
svn path=/nixpkgs/trunk/; revision=15182
-rw-r--r-- | pkgs/applications/office/openoffice/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/applications/office/openoffice/ooo-libtextcat.patch | 10 |
2 files changed, 0 insertions, 11 deletions
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 |