diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2017-12-22 15:48:30 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2017-12-24 12:54:19 +0300 |
| commit | 3c80e17ee166ea47c27b5a700942eb86af20a97d (patch) | |
| tree | 5f06176243ceadcbad74e0da8cdd462b9c61324e /pkgs/applications/office | |
| parent | c70ba3d5115e0ba967057151f8b45ccbe09f015b (diff) | |
| download | nixlib-3c80e17ee166ea47c27b5a700942eb86af20a97d.tar nixlib-3c80e17ee166ea47c27b5a700942eb86af20a97d.tar.gz nixlib-3c80e17ee166ea47c27b5a700942eb86af20a97d.tar.bz2 nixlib-3c80e17ee166ea47c27b5a700942eb86af20a97d.tar.lz nixlib-3c80e17ee166ea47c27b5a700942eb86af20a97d.tar.xz nixlib-3c80e17ee166ea47c27b5a700942eb86af20a97d.tar.zst nixlib-3c80e17ee166ea47c27b5a700942eb86af20a97d.zip | |
libreoffice-still: drop kde4 parts
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 42d8abf49bdb..679afaa2dce5 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -6,7 +6,7 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf , 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 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen @@ -15,7 +15,6 @@ , defaultIconTheme, glib, ncurses , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , withHelp ? true -, kdeIntegration ? false }: let @@ -187,7 +186,6 @@ in stdenv.mkDerivation rec { "--disable-report-builder" "--enable-python=system" "--enable-dbus" - (lib.enableFeature kdeIntegration "kde4") "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" @@ -250,8 +248,7 @@ in stdenv.mkDerivation rec { libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew ncurses libodfgen CoinMP librdf_rasqal defaultIconTheme - ] - ++ lib.optional kdeIntegration kdelibs4; + ]; nativeBuildInputs = [ wrapGAppsHook ]; passthru = { |