From 48f810bd79db6ea3d8749f040244ab6da7fbf1e0 Mon Sep 17 00:00:00 2001
From: vitalii <vitalii.voloshyn@gmail.com>
Date: Mon, 3 Oct 2022 13:24:42 +0300
Subject: [PATCH] fs-uae-launcher: fix Qt wrapping issue

Fixes #161716
---
 pkgs/applications/emulators/fs-uae/launcher.nix | 15 ++++++++++-----
 pkgs/top-level/all-packages.nix                 |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix
index afe12aab0c8..e3f39003403 100644
--- a/pkgs/applications/emulators/fs-uae/launcher.nix
+++ b/pkgs/applications/emulators/fs-uae/launcher.nix
@@ -2,8 +2,9 @@
 , stdenv
 , fetchurl
 , gettext
-, makeWrapper
 , python3
+, wrapQtAppsHook
+, fsuae
 }:
 
 stdenv.mkDerivation rec {
@@ -17,8 +18,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    makeWrapper
     python3
+    wrapQtAppsHook
   ];
 
   buildInputs = with python3.pkgs; [
@@ -29,15 +30,19 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  postInstall = ''
-    wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH"
+  dontWrapQtApps = true;
+
+  preFixup = ''
+      wrapQtApp "$out/bin/fs-uae-launcher" --set PYTHONPATH "$PYTHONPATH" \
+        --prefix PATH : ${lib.makeBinPath [ fsuae ]}
   '';
 
   meta = with lib; {
     homepage = "https://fs-uae.net";
     description = "Graphical front-end for the FS-UAE emulator";
-    license = lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with  maintainers; [ sander AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be4c2b3183c..c5561a4c123 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1510,7 +1510,7 @@ with pkgs;
 
   fsuae = callPackage ../applications/emulators/fs-uae { };
 
-  fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { };
+  fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { };
 
   fuse-emulator = callPackage ../applications/emulators/fuse-emulator {};