diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/common.nix | 4 | ||||
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/common.nix index 19c64106701e..b40bd84cbb8d 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/common.nix +++ b/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index 7549f379f8a7..f159a4cbf775 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/infra/libkookie/nixpkgs/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 { |