summary refs log tree commit diff
path: root/pkgs/applications/office/libreoffice/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-11-27 15:09:19 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-11-27 15:09:19 +0100
commitb2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch)
tree220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/applications/office/libreoffice/default.nix
parent977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff)
parentbe36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff)
downloadnixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar
nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz
nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2
nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz
nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz
nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst
nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office/libreoffice/default.nix')
-rw-r--r--pkgs/applications/office/libreoffice/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 1023af9234c..e0399a0cdf6 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -3,7 +3,7 @@
 , libxml2, db, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
-, openssl, gperf, cppunit, poppler, utillinux
+, openssl, gperf, cppunit, poppler, util-linux
 , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, clucene_core, libcdr, lcms
@@ -405,7 +405,7 @@ in (mkDrv rec {
       neon nspr nss openldap openssl pam perl pkgconfig poppler
       python3 sane-backends unzip which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
-      libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
+      libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux
       librevenge libe-book libmwaw glm ncurses epoxy
       libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
     ]