diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 7e61505a63c..848afe96210 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -10,6 +10,8 @@ postUnpack() { } preConfigure() { + ./configure --help + for i in sysui/desktop/share/makefile.mk; do substituteInPlace $i --replace /bin/bash $shell done diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 2da50c42916..3edd4e5b3f8 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -6,7 +6,7 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 }: -let version = "3.2.0"; in +let version = "3.1.1"; in stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a"; }; - patches = [ /* ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch */ ./root-required.patch ]; + patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; src_system = fetchurl { url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2"; @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { --without-system-hunspell --without-system-altlinuxhyph --without-system-lpsolve + --without-system-graphite "; LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; @@ -77,5 +78,6 @@ stdenv.mkDerivation rec { description = "OpenOffice.org is a multiplatform and multilingual office suite"; homepage = http://www.openoffice.org/; license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.raskin ]; }; }