diff options
Diffstat (limited to 'pkgs/applications/office/libreoffice/default.nix')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 30a4a47896ab..43c5e0fb627f 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, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, 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,8 @@ , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging +, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas +, defaultIconTheme, glib , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] , withHelp ? true }: @@ -19,9 +20,9 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "5"; - minor = "0"; - patch = "4"; - tweak = "2"; + minor = "1"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -47,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha"; + sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x"; + sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2"; }; }; @@ -63,12 +64,17 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34"; + sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl"; }; # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. - NIX_LDFLAGS = "-lcups"; + # 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"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. @@ -112,6 +118,8 @@ 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"; @@ -134,8 +142,14 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin $out/share/desktop + mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" + for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a + wrapProgram "$out/bin/$a" \ + --prefix XDG_DATA_DIRS : \ + "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + ; done ln -s $out/bin/soffice $out/bin/libreoffice @@ -181,7 +195,6 @@ 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" @@ -213,18 +226,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 gtk + freetype GConf getopt gnome_vfs gperf gtk3 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 pkgconfigUpstream poppler + gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + neon nspr nss openldap openssl ORBit2 pam perl pkgconfig 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 + libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper ]; meta = with stdenv.lib; { |