From 21eac1d18a334809437f533f198de21752cae729 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:27:54 +0100
Subject: [PATCH 1/2] inochi-{session,creator}: use patchelf instead of
 LD_LIBRARY_PATH

---
 pkgs/applications/misc/inochi2d/generic.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 0a08ebbaae73..a8fe7f445892 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -128,13 +128,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 = {

From 79394ca10891d773a56299a68814e6435ee50546 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:28:17 +0100
Subject: [PATCH 2/2] simple64: use patchelf instead of LD_LIBRARY_PATH

---
 pkgs/by-name/si/simple64/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix
index f98cc8732692..b593ec22dcc1 100644
--- a/pkgs/by-name/si/simple64/package.nix
+++ b/pkgs/by-name/si/simple64/package.nix
@@ -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
   '';