diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 97c657ee1811..124b64ffc2be 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -47,7 +47,8 @@ wrapSOffice() { #! $shell # Add fontconfig to the library search path; apparently OpenOffice # looks for it at runtime. -export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib +export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib:$libjpeg/lib:$cups/lib +export JAVA_HOME=$jdk exec $ooFiles/program/soffice $arg "\$@" EOF chmod +x $out/bin/$fn diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index b93fb8c5f791..95d675ebb4ab 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip , perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre, cairo, which -, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi +, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which +, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups }: stdenv.mkDerivation rec { @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { configureFlags = " --with-package-format=native - --disable-cups --disable-epm --disable-fontooo --disable-gnome-vfs @@ -57,9 +56,10 @@ 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 ]; - inherit icu fontconfig libjpeg; + inherit icu fontconfig libjpeg jdk cups; meta = { description = "OpenOffice.org is a multiplatform and multilingual office suite"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecfc44853b66..e749e9772490 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3421,7 +3421,8 @@ rec { perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron curl libsndfile flex zip unzip libmspack - getopt file neon cairo which icu boost jre jdk ant hsqldb; + getopt file neon cairo which icu boost jdk ant hsqldb + cups; inherit (xlibs) libXaw libXext libX11 libXtst libXi; inherit (gtkLibs) gtk; bison = bison23; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 2f390ab81a07..186a02177341 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -116,6 +116,7 @@ let { nss_ldap ntp nxml + openoffice openssh openssl pam_console