diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:06:42 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:06:42 +0100 |
| commit | cf27abf534930ecb1657c4a4e7466ed15c4a2076 (patch) | |
| tree | b9a0d69e1da02624fecc12c212c5421d6ef3e2af /pkgs/applications/office | |
| parent | 457e94d9008a55f0302100b00b77ea9ea478eaef (diff) | |
| parent | 6e9743f120548a614cbba21ba1ff9fc06bca3a8b (diff) | |
| download | nixpkgs-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar nixpkgs-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.gz nixpkgs-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.bz2 nixpkgs-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.lz nixpkgs-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.xz nixpkgs-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.zst nixpkgs-cf27abf534930ecb1657c4a4e7466ed15c4a2076.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office')
| -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 a459302177b..2f220fa2fb6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd -, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon +, 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 @@ -363,7 +363,7 @@ in stdenv.mkDerivation rec { libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler - python3 sablotron sane-backends unzip vigra which zip zlib + python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 4739d526558..be87a8bb672 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd -, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon +, 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 @@ -360,7 +360,7 @@ in stdenv.mkDerivation rec { libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl poppler - python3 sablotron sane-backends unzip vigra which zip zlib + python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy |