utillinux: rename to util-linux

This commit is contained in:
Graham Christensen
2020-11-24 10:29:28 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions

View File

@@ -1,7 +1,7 @@
{ version, sha256Hash }:
{ stdenv, fetchFromGitHub, fetchpatch
, fusePackages, utillinux, gettext
, fusePackages, util-linux, gettext
, meson, ninja, pkg-config
, autoreconfHook
, python3Packages, which
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
# $PATH, so it should also work on non-NixOS systems.
export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""
sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
sed -e 's@/bin/@${util-linux}/bin/@g' -i lib/mount_util.c
'' + (if isFuse3 then ''
# The configure phase will delete these files (temporary workaround for
# ./fuse3-install_man.patch)

View File

@@ -1,8 +1,8 @@
{ callPackage, utillinux }:
{ callPackage, util-linux }:
let
mkFuse = args: callPackage (import ./common.nix args) {
inherit utillinux;
inherit util-linux;
};
in {
fuse_2 = mkFuse {