diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
| commit | ad47d658d1734353df834a05e45b98dae968550d (patch) | |
| tree | 5ee2481126f5e29cf961e3b955b748609bc08f82 /pkgs/applications/office/libreoffice | |
| parent | 8213ff161c461655aaff7d43984384dbca64b312 (diff) | |
| parent | cc218fc91530529b84307faf6fa2dd8c5d395d6f (diff) | |
| download | nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.gz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.bz2 nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.lz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.xz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.zst nixlib-ad47d658d1734353df834a05e45b98dae968550d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e3ff0b594b4e..43258282ac06 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext -, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd +, CompressZlib, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito +, fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index dbfeb0f2fe86..7a2538e4bcd6 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd +, CompressZlib, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, carlito @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, fontsConf, pkgconfig, bluez5, libtool , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook |