Merge pull request #321409 from eclairevoyant/hmcl

hmcl: fix gtk wrapping

pkgs/games/hmcl/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, makeBinaryWrapper
 , makeDesktopItem
 , wrapGAppsHook3
 , copyDesktopItems
@@ -15,6 +14,7 @@
 , alsa-lib
 , wayland
 , libpulseaudio
+, gobject-introspection
 }:
 
 let
@@ -49,13 +49,24 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    makeBinaryWrapper
+    gobject-introspection
     wrapGAppsHook3
     copyDesktopItems
     imagemagick
   ];
 
-  installPhase =
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/hmcl}
+    cp $src $out/lib/hmcl/hmcl.jar
+    magick ${icon} hmcl.png
+    install -Dm644 hmcl-1.png $out/share/icons/hicolor/32x32/apps/hmcl.png
+
+    runHook postInstall
+  '';
+
+    fixupPhase =
       let
         libpath = lib.makeLibraryPath ([
           libGL
@@ -73,17 +84,15 @@ stdenv.mkDerivation (finalAttrs: {
           wayland
           alsa-lib
         ]);
-    in
+      in ''
-    ''
+        runHook preFixup
-      runHook preInstall
+
-      mkdir -p $out/{bin,lib/hmcl}
-      cp $src $out/lib/hmcl/hmcl.jar
-      magick ${icon} hmcl.png
-      install -Dm644 hmcl-1.png $out/share/icons/hicolor/32x32/apps/hmcl.png
         makeBinaryWrapper ${jre}/bin/java $out/bin/hmcl \
           --add-flags "-jar $out/lib/hmcl/hmcl.jar" \
-        --set LD_LIBRARY_PATH ${libpath}
+          --set LD_LIBRARY_PATH ${libpath} \
-      runHook postInstall
+          ''${gappsWrapperArgs[@]}
+
+        runHook postFixup
       '';
 
   meta = with lib; {