diff options
author | Graham Christensen <graham@grahamc.com> | 2020-11-24 10:29:28 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2020-11-24 12:42:06 -0500 |
commit | bc49a0815ae860010b4d593b02f00ab6f07d50ea (patch) | |
tree | 1435af86f0f2172632621a400f27a44599751f17 /pkgs/applications/office | |
parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) |
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/softmaker/generic.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 1023af9234c9..e0399a0cdf66 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 ] diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 56f3cb74363f..29ca574a4174 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -8,7 +8,7 @@ , coreutils, libredirect # Extra utilities used by the SoftMaker applications. -, gnugrep, utillinux, which +, gnugrep, util-linux, which , pname, version, edition, suiteName, src, archive @@ -72,7 +72,7 @@ in stdenv.mkDerivation { extraWrapperArgs = '' --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep utillinux which ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep util-linux which ]}" ''; in '' runHook preInstall |