{simple64,inochi-session,inochi-creator}: use patchelf instead of LD_LIBRARY_PATH (#371154)

This commit is contained in:
Peder Bergebakken Sundt
2025-04-19 03:54:01 +02:00
committed by GitHub
2 changed files with 13 additions and 12 deletions
+9 -7
View File
@@ -131,13 +131,15 @@ buildDubPackage (
postFixup = ''
# Add support for `open file` dialog
makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \
--prefix PATH : ${lib.makeBinPath [ zenity ]} \
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libGL
luajit_2_1
]
}
--prefix PATH : ${lib.makeBinPath [ zenity ]}
patchelf $out/share/${pname}/${pname} \
--add-rpath ${
lib.makeLibraryPath [
libGL
luajit_2_1
]
}
'';
meta = {
+4 -5
View File
@@ -71,8 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
dontUseCmakeConfigure = true;
dontWrapQtApps = true;
buildPhase = ''
runHook preInstall
@@ -89,9 +87,10 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm644 ./simple64-gui/icons/simple64.svg -t $out/share/icons/hicolor/scalable/apps/
makeWrapper $out/share/simple64/simple64-gui $out/bin/simple64-gui \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \
"''${qtWrapperArgs[@]}"
patchelf $out/share/simple64/simple64-gui \
--add-needed libvulkan.so.1 --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
ln -s $out/share/simple64/simple64-gui $out/bin/simple64-gui
runHook postInstall
'';