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/os-specific/linux/fuse | |
| parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) | |
| download | nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.gz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.bz2 nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.lz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.xz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.zst nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.zip | |
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 19c64106701..b40bd84cbb8 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -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) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 7549f379f8a..f159a4cbf77 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -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 { |