diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-07 11:14:23 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-08 10:32:22 +0200 |
commit | bd16668567fbba95c42c00616480309a38673444 (patch) | |
tree | a603b9f0a1091a5abfa0a91170d5bf747e141071 | |
parent | 14be4ca20a3c336d0bf17de154219bf84e6a27cb (diff) | |
download | nixlib-bd16668567fbba95c42c00616480309a38673444.tar nixlib-bd16668567fbba95c42c00616480309a38673444.tar.gz nixlib-bd16668567fbba95c42c00616480309a38673444.tar.bz2 nixlib-bd16668567fbba95c42c00616480309a38673444.tar.lz nixlib-bd16668567fbba95c42c00616480309a38673444.tar.xz nixlib-bd16668567fbba95c42c00616480309a38673444.tar.zst nixlib-bd16668567fbba95c42c00616480309a38673444.zip |
libreoffice-still: drop gnome2 dependencies
They are not needed any more: * ORBit2: https://github.com/LibreOffice/core/commit/a219edfbb65e6623dde2d52c41547d78346b7144 * GConf: https://github.com/LibreOffice/core/commit/3cf557c12d27f1b2250e69a543136da098112d80 * gnome_vfs: https://github.com/LibreOffice/core/commit/b40b6010077f875565ce90cd995222451e37321c
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a7d8f4c7d40f..9517a4404def 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -3,8 +3,8 @@ , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge -, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient +, 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, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -347,13 +347,13 @@ in (stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip boost cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk2 + freetype getopt gperf gtk3 gtk2 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 libGLU libGL mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient - neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler + neon nspr nss openldap openssl pam perl pkgconfig poppler python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b74f1d41d6a..e08240a5049d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20270,7 +20270,6 @@ in libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; - inherit (gnome2) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; fontsConf = makeFontsConf { fontDirectories = [ |