From 417457f6f9aebc1827cf1874c040e168a159fa7e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 3 Mar 2016 19:40:34 +0100 Subject: [PATCH] libreoffice: disable kdeIntegration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #13651 @edolstra: “IIRC, the "KDE integration" consists mainly in providing a Qt/KDE "File open" dialog, which we can probably live without. In fact, it has been known to malfunction if Libreoffice's KDE version is different from the system KDE version. So disabling this sounds like a good idea.” --- pkgs/applications/office/libreoffice/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1a5cf987fd8..040b4893032 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -15,10 +15,12 @@ , defaultIconTheme, glib , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] , withHelp ? true +, kdeIntegration ? false }: let - langsSpaces = stdenv.lib.concatStringsSep " " langs; + lib = stdenv.lib; + langsSpaces = lib.concatStringsSep " " langs; major = "5"; minor = "1"; patch = "0"; @@ -90,7 +92,6 @@ in stdenv.mkDerivation rec { ''; QT4DIR = qt4; - KDE4DIR = kde4.kdelibs; # Fix boost 1.59 compat # Try removing in the next version @@ -178,7 +179,7 @@ in stdenv.mkDerivation rec { "--disable-report-builder" "--enable-python=system" "--enable-dbus" - "--enable-kde4" + (lib.enableFeature kdeIntegration "kde4") "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" @@ -230,7 +231,7 @@ in stdenv.mkDerivation rec { [ 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 - hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg + hunspell icu jdk 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 @@ -241,9 +242,10 @@ in stdenv.mkDerivation rec { libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper - ]; + ] + ++ lib.optional kdeIntegration kde4.kdelibs; - meta = with stdenv.lib; { + meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = http://libreoffice.org/; license = licenses.lgpl3;