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

libreoffice-still: drop gnome2 dependencies 

They are not needed any more:

* ORBit2: a219edfbb6
* GConf: 3cf557c12d
* gnome_vfs: b40b601007
This commit is contained in:
Jan Tojnar 2020-04-07 11:14:23 +02:00
parent 14be4ca20a
commit bd16668567
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

1
pkgs/top-level/all-packages.nix
View File

@ -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 = [