Merge pull request #179291 from dotlambda/utillinux-alias

treewide: don't use utillinux alias
2022-07-02 00:05:54 +02:00 · 2022-07-02 00:05:54 +02:00 · c0d1de14b3
parent e953e73b6f 40990c3586
commit c0d1de14b3
3 changed files with 4 additions and 4 deletions
--- 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
    ]
  );
--- 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
    ]
  );
--- 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"