colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fix fs-uae-launcher Qt wrapping issue
This commit is contained in:
Anderson Torres 2022-10-05 23:01:06 -03:00 committed by GitHub
commit cabcec1477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/emulators/fs-uae/launcher.nix
View File

@ -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" ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -1512,7 +1512,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 {};