Merge pull request #179291 from dotlambda/utillinux-alias
treewide: don't use utillinux alias
This commit is contained in:
commit
c0d1de14b3
|
@ -128,7 +128,7 @@ let
|
||||||
gptfdisk
|
gptfdisk
|
||||||
nix
|
nix
|
||||||
parted
|
parted
|
||||||
utillinux
|
util-linux
|
||||||
zfs
|
zfs
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
|
@ -116,7 +116,7 @@ let
|
||||||
gptfdisk
|
gptfdisk
|
||||||
nix
|
nix
|
||||||
parted
|
parted
|
||||||
utillinux
|
util-linux
|
||||||
zfs
|
zfs
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
, gtk3
|
, gtk3
|
||||||
, json-glib
|
, json-glib
|
||||||
, libgee
|
, libgee
|
||||||
, utillinux
|
, util-linux
|
||||||
, vte
|
, vte
|
||||||
, xapps
|
, xapps
|
||||||
}:
|
}:
|
||||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
while IFS="" read -r -d $'\0' FILE; do
|
while IFS="" read -r -d $'\0' FILE; do
|
||||||
substituteInPlace "$FILE" \
|
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)
|
done < <(find ./src -mindepth 1 -name "*.vala" -type f -print0)
|
||||||
substituteInPlace ./src/Utility/IconManager.vala \
|
substituteInPlace ./src/Utility/IconManager.vala \
|
||||||
--replace "/usr/share" "$out/share"
|
--replace "/usr/share" "$out/share"
|
||||||
|
|
Loading…
Reference in a new issue