Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fs-uae-launcher Qt wrapping issue #194206

Merged
merged 1 commit into from
Oct 6, 2022
Merged

Fix fs-uae-launcher Qt wrapping issue #194206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions pkgs/applications/emulators/fs-uae/launcher.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
, stdenv
, fetchurl
, gettext
, makeWrapper
, python3
, wrapQtAppsHook
, fsuae
}:

stdenv.mkDerivation rec {
Expand All @@ -17,8 +18,8 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
gettext
makeWrapper
python3
wrapQtAppsHook
];

buildInputs = with python3.pkgs; [
Expand All @@ -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" ];
};
}

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};

Expand Down