public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13654 from Profpatsch/libreoffice-kde

Browse Source 
libreoffice: disable kdeIntegration
This commit is contained in:
Michael Raskin 2016-03-04 15:06:50 +00:00
commit 67493da97f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/office/libreoffice/default.nix
View File

@ -15,10 +15,12 @@
, defaultIconTheme, glib , defaultIconTheme, glib
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
, withHelp ? true , withHelp ? true
, kdeIntegration ? false
}: }:
let let
langsSpaces = stdenv.lib.concatStringsSep " " langs; lib = stdenv.lib;
langsSpaces = lib.concatStringsSep " " langs;
major = "5"; major = "5";
minor = "1"; minor = "1";
patch = "0"; patch = "0";
@ -90,7 +92,6 @@ in stdenv.mkDerivation rec {
''; '';
QT4DIR = qt4; QT4DIR = qt4;
KDE4DIR = kde4.kdelibs;
# Fix boost 1.59 compat # Fix boost 1.59 compat
# Try removing in the next version # Try removing in the next version
@ -178,7 +179,7 @@ in stdenv.mkDerivation rec {
"--disable-report-builder" "--disable-report-builder"
"--enable-python=system" "--enable-python=system"
"--enable-dbus" "--enable-dbus"
"--enable-kde4" (lib.enableFeature kdeIntegration "kde4")
"--with-package-format=installed" "--with-package-format=installed"
"--enable-epm" "--enable-epm"
"--with-jdk-home=${jdk.home}" "--with-jdk-home=${jdk.home}"
@ -230,7 +231,7 @@ in stdenv.mkDerivation rec {
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig 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 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 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
@ -241,9 +242,10 @@ in stdenv.mkDerivation rec {
libxshmfence libatomic_ops graphite2 harfbuzz libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew librevenge libe-book libmwaw glm glew
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper 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"; description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = http://libreoffice.org/; homepage = http://libreoffice.org/;
license = licenses.lgpl3; license = licenses.lgpl3;