diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 215725261134..d525ab42fc67 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -3,27 +3,19 @@ , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups -, libXinerama +, libXinerama, openssl }: +let version = "2.4.1"; in stdenv.mkDerivation rec { - name = "openoffice.org-2.3.1"; + name = "openoffice.org-${version}"; builder = ./builder.sh; 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 { - url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.1; - name = "OOo_2.3.1_src_core.tar.bz2"; - md5 = "9555a2d5fae9a25c788cc732921ef57a"; + url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=${version}"; + name = "OOo_${version}_src_core.tar.bz2"; + sha256 = "1405l6xb1qy6l43n9nli8hhay917nyr8a69agj483aaiskrpdxdb"; }; configureFlags = " @@ -68,7 +60,7 @@ stdenv.mkDerivation rec { libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack getopt file jdk cairo which icu boost libXext libX11 libXtst libXi - cups libXinerama + cups libXinerama openssl ]; inherit icu fontconfig libjpeg jdk cups; diff --git a/pkgs/applications/office/openoffice/ooo-libtextcat.patch b/pkgs/applications/office/openoffice/ooo-libtextcat.patch index ac2ae0a2265d..6fe7b7108c33 100644 --- a/pkgs/applications/office/openoffice/ooo-libtextcat.patch +++ b/pkgs/applications/office/openoffice/ooo-libtextcat.patch @@ -1,11 +1,10 @@ ---- 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 @@ +--- 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 + CONFIGURE_ACTION=configure CFLAGS="$(EXTRA_CFLAGS)" -CONFIGURE_FLAGS= -+CONFIGURE_FLAGS=--prefix=${out} ++CONFIGURE_FLAGS=--prefix="${out}" BUILD_ACTION=make - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7247658d3869..199c3983826f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6524,7 +6524,7 @@ let pkgs = rec { expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron curl libsndfile flex zip unzip libmspack getopt file neon cairo which icu boost jdk ant hsqldb - cups; + cups openssl; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (gtkLibs) gtk; bison = bison23;