From 40990c35863d38ca49e5d3b136fdc33525699165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Jun 2022 04:55:23 +0000
Subject: [PATCH] treewide: don't use utillinux alias

---
 nixos/lib/make-multi-disk-zfs-image.nix          | 2 +-
 nixos/lib/make-single-disk-zfs-image.nix         | 2 +-
 pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix
index a84732aa1171..0a894c8b9888 100644
--- a/nixos/lib/make-multi-disk-zfs-image.nix
+++ b/nixos/lib/make-multi-disk-zfs-image.nix
@@ -128,7 +128,7 @@ let
       gptfdisk
       nix
       parted
-      utillinux
+      util-linux
       zfs
     ]
   );
diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix
index 9310febd9179..98150584fb3e 100644
--- a/nixos/lib/make-single-disk-zfs-image.nix
+++ b/nixos/lib/make-single-disk-zfs-image.nix
@@ -116,7 +116,7 @@ let
       gptfdisk
       nix
       parted
-      utillinux
+      util-linux
       zfs
     ]
   );
diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index 1f34491dafdc..65db24062620 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -8,7 +8,7 @@
 , gtk3
 , json-glib
 , libgee
-, utillinux
+, util-linux
 , vte
 , xapps
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     while IFS="" read -r -d $'\0' FILE; do
       substituteInPlace "$FILE" \
-        --replace "/sbin/blkid" "${utillinux}/bin/blkid"
+        --replace "/sbin/blkid" "${util-linux}/bin/blkid"
     done < <(find ./src -mindepth 1 -name "*.vala" -type f -print0)
     substituteInPlace ./src/Utility/IconManager.vala \
       --replace "/usr/share" "$out/share"