From 739e9ee35f978ec58de9258fb408be52b7ec4d22 Mon Sep 17 00:00:00 2001
From: Celio Grand <celiogrand@outlook.com>
Date: Tue, 19 Nov 2024 23:02:31 +0800
Subject: [PATCH] tuxguitar: apply suggestions

---
 pkgs/by-name/tu/tuxguitar/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix
index bbea8d4dea70..2a6fe2d955cc 100644
--- a/pkgs/by-name/tu/tuxguitar/package.nix
+++ b/pkgs/by-name/tu/tuxguitar/package.nix
@@ -11,7 +11,7 @@
   libpulseaudio,
   lilv,
   which,
-  wrapGAppsHook,
+  wrapGAppsHook3,
   nixosTests,
 }:
 
@@ -24,15 +24,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4=";
   };
 
-  buildInputs = [
-    which
-  ];
-
   nativeBuildInputs = [
     makeWrapper
-    wrapGAppsHook
+    wrapGAppsHook3
   ];
 
+  dontWrapGApps = true;
+
   installPhase = ''
     mkdir -p $out/bin
     cp -r dist lib share $out/
@@ -41,9 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s $out/dist $out/bin/dist
     ln -s $out/lib $out/bin/lib
     ln -s $out/share $out/bin/share
+  '';
 
+  postFixup = ''
     wrapProgram $out/bin/tuxguitar \
-      --set PATH "$PATH:${jre}/bin" \
+      "''${gappsWrapperArgs[@]}" \
+      --prefix PATH : ${lib.makeBinPath[ jre which ]} \
       --prefix LD_LIBRARY_PATH : "$out/lib/:${
         lib.makeLibraryPath [
           swt