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

Try out expression for OpenOffice.org 2.4.1.

Browse Source 
Warning: I have *not* built it locally, so the main purpose is
to run the whole build on the build farm, hoping it won't fail.
Feel free to fix or revert if it does.

svn path=/nixpkgs/trunk/; revision=12622
This commit is contained in:
Ludovic Courtès 2008-08-14 15:09:41 +00:00
parent 48d8e0779c
commit a8b28c34af
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,27 +3,19 @@
, 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 , libXinerama, openssl
}: }:
let version = "2.4.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openoffice.org-2.3.1"; name = "openoffice.org-${version}";
builder = ./builder.sh; builder = ./builder.sh;
src = src =
#if (stdenv.system == "i686-linux") then
#fetchurl {
# stable 2.3.0 is failing - got the tip on the mailinglist to have look
# at http://www.openoffice.org/issues/show_bug.cgi?id=74751
# now I'm trying snapshot because it should already have this patch
#url = http://ftp.ussg.iu.edu/openoffice/contrib/rc/2.3.1rc1/OOo_2.3.1rc1_src_core.tar.bz2;
#name = "OOo_2.3.1_src_core.tar.bz2";
#sha256 = "";
#} else
fetchurl { fetchurl {
url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.1; url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=${version}";
name = "OOo_2.3.1_src_core.tar.bz2"; name = "OOo_${version}_src_core.tar.bz2";
md5 = "9555a2d5fae9a25c788cc732921ef57a"; sha256 = "1405l6xb1qy6l43n9nli8hhay917nyr8a69agj483aaiskrpdxdb";
}; };
configureFlags = " configureFlags = "
@ -68,7 +60,7 @@ 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 libXinerama cups libXinerama openssl
]; ];
inherit icu fontconfig libjpeg jdk cups; inherit icu fontconfig libjpeg jdk cups;

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

@ -1,11 +1,10 @@
--- OOG680_m5/libtextcat/makefile.mk 2007-06-21 18:09:52.000000000 +0200 --- OOH680_m17/libtextcat/makefile.mk 2008-01-02 18:33:39.000000000 +0100
+++ OOG680_m5.new/libtextcat/makefile.mk 2007-09-18 23:59:56.000000000 +0200 +++ OOH680_m17/libtextcat/makefile.mk 2008-08-14 15:52:19.000000000 +0200
@@ -62,7 +62,7 @@ @@ -62,6 +62,6 @@ ADDITIONAL_FILES= \
#relative to CONFIGURE_DIR #relative to CONFIGURE_DIR
CONFIGURE_ACTION=configure CONFIGURE_ACTION=configure CFLAGS="$(EXTRA_CFLAGS)"
-CONFIGURE_FLAGS= -CONFIGURE_FLAGS=
+CONFIGURE_FLAGS=--prefix=${out} +CONFIGURE_FLAGS=--prefix="${out}"
BUILD_ACTION=make BUILD_ACTION=make

2
pkgs/top-level/all-packages.nix
View File

@ -6524,7 +6524,7 @@ let pkgs = rec {
expat pkgconfig freetype fontconfig libwpd libxml2 expat pkgconfig freetype fontconfig libwpd libxml2
db4 sablotron curl libsndfile flex zip unzip libmspack db4 sablotron curl libsndfile flex zip unzip libmspack
getopt file neon cairo which icu boost jdk ant hsqldb getopt file neon cairo which icu boost jdk ant hsqldb
cups; cups openssl;
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
bison = bison23; bison = bison23;