Merge pull request #179291 from dotlambda/utillinux-alias

treewide: don't use utillinux alias
This commit is contained in:
Martin Weinelt 2022-07-02 00:05:54 +02:00 committed by GitHub
commit c0d1de14b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -128,7 +128,7 @@ let
gptfdisk
nix
parted
utillinux
util-linux
zfs
]
);

View File

@ -116,7 +116,7 @@ let
gptfdisk
nix
parted
utillinux
util-linux
zfs
]
);

View File

@ -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"