diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2016-02-26 16:26:26 +0100 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2016-02-26 16:26:34 +0100 |
commit | 66febbdfa79b228e188cd2580a98e9240018dcc5 (patch) | |
tree | 1994e439c899fd9d59dcb66ff570dd58753c2e32 /pkgs/applications/office | |
parent | 2bcec4272fa36d03077a2ddf2eaecb5a8acd903f (diff) | |
download | nixpkgs-66febbdfa79b228e188cd2580a98e9240018dcc5.tar nixpkgs-66febbdfa79b228e188cd2580a98e9240018dcc5.tar.gz nixpkgs-66febbdfa79b228e188cd2580a98e9240018dcc5.tar.bz2 nixpkgs-66febbdfa79b228e188cd2580a98e9240018dcc5.tar.lz nixpkgs-66febbdfa79b228e188cd2580a98e9240018dcc5.tar.xz nixpkgs-66febbdfa79b228e188cd2580a98e9240018dcc5.tar.zst nixpkgs-66febbdfa79b228e188cd2580a98e9240018dcc5.zip |
Temporarily revert LibreOffice update
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7c73e7b808c..30a4a47896a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -11,7 +11,7 @@ , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging, librdf_rasqal +, gdb, commonsLogging , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] , withHelp ? true }: @@ -19,9 +19,9 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "5"; - minor = "1"; - patch = "0"; - tweak = "3"; + minor = "0"; + patch = "4"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -47,14 +47,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px"; + sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2"; + sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x"; }; }; @@ -63,17 +63,12 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl"; + sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34"; }; # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. - # It also seems not to mention libdl explicitly in some places. - NIX_LDFLAGS = "-lcups -ldl"; - - # For some reason librdf_redland sometimes refers to rasqal.h instead - # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + NIX_LDFLAGS = "-lcups"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. @@ -117,8 +112,6 @@ in stdenv.mkDerivation rec { # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -188,6 +181,7 @@ in stdenv.mkDerivation rec { # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though + "--disable-kde" "--disable-odk" "--disable-postgresql-sdbc" "--disable-firebird-sdbc" @@ -219,18 +213,18 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk + freetype GConf getopt gnome_vfs gperf gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base - neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler + neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler python3 sablotron sane-backends tcsh unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew - libodfgen CoinMP librdf_rasqal + libodfgen CoinMP ]; meta = with stdenv.lib; { |