fix: Move util-linux to wrapProgram

This commit is contained in:
Nathan McCarty 2022-06-24 21:55:08 -04:00
parent 908fc2fd5e
commit 4ade2ae9e9
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
1 changed files with 2 additions and 2 deletions

View File

@ -39,7 +39,6 @@
xorg.libXrender xorg.libXrender
xorg.libXtst xorg.libXtst
zlib zlib
util-linux
]; ];
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
autoPatchelfHook autoPatchelfHook
@ -72,7 +71,8 @@
# breaks building OpenJDK (#114495). # breaks building OpenJDK (#114495).
for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
if patchelf --print-interpreter "$bin" &> /dev/null; then if patchelf --print-interpreter "$bin" &> /dev/null; then
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" \
--prefix PATH : ${lib.makeBinPath [ pkgs.util-linux ]}
fi fi
done done
''; '';