Merge pull request #194206 from PanAeon/fix-fs-uae-launcher

Fix fs-uae-launcher Qt wrapping issue

authored by Anderson Torres and committed by GitHub cabcec14 4a6979d3

+11 -6
+10 -5
pkgs/applications/emulators/fs-uae/launcher.nix
··· 2 , stdenv 3 , fetchurl 4 , gettext 5 - , makeWrapper 6 , python3 7 }: 8 9 stdenv.mkDerivation rec { ··· 17 18 nativeBuildInputs = [ 19 gettext 20 - makeWrapper 21 python3 22 ]; 23 24 buildInputs = with python3.pkgs; [ ··· 29 30 makeFlags = [ "prefix=$(out)" ]; 31 32 - postInstall = '' 33 - wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH" 34 ''; 35 36 meta = with lib; { 37 homepage = "https://fs-uae.net"; 38 description = "Graphical front-end for the FS-UAE emulator"; 39 - license = lib.licenses.gpl2Plus; 40 maintainers = with maintainers; [ sander AndersonTorres ]; 41 platforms = [ "i686-linux" "x86_64-linux" ]; 42 }; 43 }
··· 2 , stdenv 3 , fetchurl 4 , gettext 5 , python3 6 + , wrapQtAppsHook 7 + , fsuae 8 }: 9 10 stdenv.mkDerivation rec { ··· 18 19 nativeBuildInputs = [ 20 gettext 21 python3 22 + wrapQtAppsHook 23 ]; 24 25 buildInputs = with python3.pkgs; [ ··· 30 31 makeFlags = [ "prefix=$(out)" ]; 32 33 + dontWrapQtApps = true; 34 + 35 + preFixup = '' 36 + wrapQtApp "$out/bin/fs-uae-launcher" --set PYTHONPATH "$PYTHONPATH" \ 37 + --prefix PATH : ${lib.makeBinPath [ fsuae ]} 38 ''; 39 40 meta = with lib; { 41 homepage = "https://fs-uae.net"; 42 description = "Graphical front-end for the FS-UAE emulator"; 43 + license = licenses.gpl2Plus; 44 maintainers = with maintainers; [ sander AndersonTorres ]; 45 platforms = [ "i686-linux" "x86_64-linux" ]; 46 }; 47 } 48 +
+1 -1
pkgs/top-level/all-packages.nix
··· 1512 1513 fsuae = callPackage ../applications/emulators/fs-uae { }; 1514 1515 - fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; 1516 1517 fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; 1518
··· 1512 1513 fsuae = callPackage ../applications/emulators/fs-uae { }; 1514 1515 + fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; 1516 1517 fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; 1518