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

libreoffice-still: drop kde4 parts

Browse Source
This commit is contained in:
gnidorah 2017-12-22 15:48:30 +03:00
parent c70ba3d511
commit 3c80e17ee1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/office/libreoffice/still.nix
View File

@ -6,7 +6,7 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler , openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra , libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen , libatomic_ops, graphite2, harfbuzz, libodfgen
@ -15,7 +15,6 @@
, defaultIconTheme, glib, ncurses , defaultIconTheme, glib, ncurses
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true , withHelp ? true
, kdeIntegration ? false
}: }:
let let
@ -187,7 +186,6 @@ in stdenv.mkDerivation rec {
"--disable-report-builder" "--disable-report-builder"
"--enable-python=system" "--enable-python=system"
"--enable-dbus" "--enable-dbus"
(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}"
@ -250,8 +248,7 @@ in stdenv.mkDerivation rec {
libxshmfence libatomic_ops graphite2 harfbuzz libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses librevenge libe-book libmwaw glm glew ncurses
libodfgen CoinMP librdf_rasqal defaultIconTheme libodfgen CoinMP librdf_rasqal defaultIconTheme
] ];
++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
passthru = { passthru = {