From 2af54e28fe7bedd2821cccd2ce0fa6d523442164 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Wed, 5 Oct 2022 16:08:57 -0400 Subject: [PATCH] fix: utillinux -> util-linux --- modules/global/packages.nix | 2 +- users/modules/bindmounts.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/global/packages.nix b/modules/global/packages.nix index 5e27c12..74e445c 100644 --- a/modules/global/packages.nix +++ b/modules/global/packages.nix @@ -43,7 +43,7 @@ unixtools.whereis unzip usbutils - utillinux + util-linux vim wget whois diff --git a/users/modules/bindmounts.nix b/users/modules/bindmounts.nix index 7798f31..3f0a6df 100644 --- a/users/modules/bindmounts.nix +++ b/users/modules/bindmounts.nix @@ -125,7 +125,7 @@ in Service = { ExecStart = "${startScript}"; ExecStop = "${stopScript}"; - Environment = "PATH=${makeBinPath [ pkgs.coreutils pkgs.utillinux pkgs.gnugrep pkgs.bindfs ]}:/run/wrappers/bin"; + Environment = "PATH=${makeBinPath [ pkgs.coreutils pkgs.util-linux pkgs.gnugrep pkgs.bindfs ]}:/run/wrappers/bin"; }; }; }; @@ -159,7 +159,7 @@ in inherit (dir) source target; targetDir = escapeShellArg (concatPaths [ persistentStoragePath source ]); mountPoint = escapeShellArg (concatPaths [ config.home.homeDirectory target ]); - mount = "${pkgs.utillinux}/bin/mount"; + mount = "${pkgs.util-linux}/bin/mount"; bindfsOptions = concatStringsSep "," ( optional (!cfg.${persistentStoragePath}.allowOther) "no-allow-other" ++ optional (versionAtLeast pkgs.bindfs.version "1.14.9") "fsname=${targetDir}"