public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.3.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=9339
This commit is contained in:
Armijn Hemel 2007-09-19 03:15:37 +00:00
parent 7c1741a1ae
commit 1e11727f67
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/office/openoffice/default.nix
View File

@ -3,15 +3,16 @@
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups , icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups
, libXinerama
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openoffice.org-2.2.1"; name = "openoffice.org-2.3.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.2.1/OOo_2.2.1_src_core.tar.bz2; url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.3.0/OOo_2.3.0_src_core.tar.bz2;
sha256 = "1mn7p68m6z3rlwm2ynvvbzz2idpyds2hjmwlhycfsp1gi644ridd"; sha256 = "0mkxn9qj3f03rjkmxc4937gr2w429hnxzb9j5j2grdknfga5a1c3";
}; };
configureFlags = " configureFlags = "
@ -56,11 +57,13 @@ stdenv.mkDerivation rec {
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
cups cups libXinerama
]; ];
inherit icu fontconfig libjpeg jdk cups; inherit icu fontconfig libjpeg jdk cups;
patches = [./ooo-libtextcat.patch];
meta = { meta = {
description = "OpenOffice.org is a multiplatform and multilingual office suite"; description = "OpenOffice.org is a multiplatform and multilingual office suite";
homepage = http://www.openoffice.org/; homepage = http://www.openoffice.org/;

11
pkgs/applications/office/openoffice/ooo-libtextcat.patch Normal file
View File

@ -0,0 +1,11 @@
--- OOG680_m5/libtextcat/makefile.mk 2007-06-21 18:09:52.000000000 +0200
+++ OOG680_m5.new/libtextcat/makefile.mk 2007-09-18 23:59:56.000000000 +0200
@@ -62,7 +62,7 @@
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS=
+CONFIGURE_FLAGS=--prefix=${out}
BUILD_ACTION=make