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

now builds on x86_64-linux as well

Browse Source 
svn path=/nixpkgs/trunk/; revision=9829
This commit is contained in:
Marc Weber 2007-12-03 04:16:33 +00:00
parent 30669073d5
commit 70decf6b0e
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,11 +10,21 @@ stdenv.mkDerivation rec {
name = "openoffice.org-2.3.0"; name = "openoffice.org-2.3.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src =
url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.0; #if (stdenv.system == "i686-linux") then
name = "OOo_2.3.0_src_core.tar.bz2"; #fetchurl {
sha256 = "0mkxn9qj3f03rjkmxc4937gr2w429hnxzb9j5j2grdknfga5a1c3"; # 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 {
url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.0;
name = "OOo_2.3.0_src_core.tar.bz2";
sha256 = "0mkxn9qj3f03rjkmxc4937gr2w429hnxzb9j5j2grdknfga5a1c3";
};
configureFlags = " configureFlags = "
--with-package-format=native --with-package-format=native
@ -63,7 +73,14 @@ stdenv.mkDerivation rec {
inherit icu fontconfig libjpeg jdk cups; inherit icu fontconfig libjpeg jdk cups;
patches = [./ooo-libtextcat.patch]; # libawt_problem see http://www.openoffice.org/issues/show_bug.cgi?id=74751
# Can be removed in newer releases than 2.3.0
patch_file = ./libawt_problem;
patches = [./ooo-libtextcat.patch ];
patchPhase = "
patch config_office/set_soenv.in \$patch_file
unset patchPhase; patchPhase;
";
meta = { meta = {
description = "OpenOffice.org is a multiplatform and multilingual office suite"; description = "OpenOffice.org is a multiplatform and multilingual office suite";

10
pkgs/applications/office/openoffice/libawt_problem Normal file
View File

@ -0,0 +1,10 @@
--- config_office/set_soenv.in 2007-02-21 16:31:51.000000000 +0100
+++ config_office/set_soenv.in.new 2007-02-21 20:37:17.000000000 +0100
@@ -426,6 +426,7 @@
$OUTPATH = "unxlngx6";
# Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
}