diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-11-07 20:58:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 20:58:34 +0000 |
| commit | 3ca5b090a94d31c8b0388b563e73e4c07b62f937 (patch) | |
| tree | c70a4e0ddd147984e54652f34b11a1db4ccaa323 /pkgs/applications/office | |
| parent | 6f4a1cb60bb617ef5b39f886a421de949c8f56db (diff) | |
| parent | c8b7c9bf69053850d67b74ea3f3e3c2de3733fa5 (diff) | |
Merge pull request #103064 from ilmari-lauhakangas/patch-1
Remove vigra and glew as obsolete LibreOffice dependencies
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 111e50b7d454..2f961f43da0a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,11 +6,11 @@ , openssl, gperf, cppunit, poppler, utillinux , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus-glib, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, clucene_core, libcdr, lcms , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf -, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 +, librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] @@ -394,10 +394,10 @@ in (mkDrv rec { libXdmcp libpthreadstubs libGLU libGL mythes glib libmysqlclient neon nspr nss openldap openssl pam perl pkgconfig poppler - python3 sane-backends unzip vigra which zip zlib + python3 sane-backends unzip which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux - librevenge libe-book libmwaw glm glew ncurses epoxy + librevenge libe-book libmwaw glm ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) |