From 3fe959d3dc34e7db6ef3aae55fa2aa6cbbd5719a Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sun, 30 Jan 2022 18:22:23 -0800
Subject: [PATCH] refactor: utillinux -> util-linux

---
 home-manager.nix | 4 ++--
 nixos.nix        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/home-manager.nix b/home-manager.nix
index ca8c2df..aba55df 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -198,7 +198,7 @@ in
                 Type = "forking";
                 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";
               };
             };
           };
@@ -236,7 +236,7 @@ in
                 dir;
             targetDir = escapeShellArg (concatPaths [ persistentStoragePath dir ]);
             mountPoint = escapeShellArg (concatPaths [ config.home.homeDirectory mountDir ]);
-            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}"
diff --git a/nixos.nix b/nixos.nix
index e0b8c83..191f6b2 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -297,7 +297,7 @@ in
               description = "Bind mount or link ${targetFile} to ${mountPoint}";
               wantedBy = [ "local-fs.target" ];
               before = [ "local-fs.target" ];
-              path = [ pkgs.utillinux ];
+              path = [ pkgs.util-linux ];
               unitConfig.DefaultDependencies = false;
               serviceConfig = {
                 Type = "oneshot";