From 5dc20e9ede9000e33d57cb4454c695f132db0344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Tue, 22 Oct 2024 22:46:37 +0300 Subject: [PATCH] lutris: fix RPCS3 AppImage A lot of runners are AppImages and these due to their fuse + FHS dependencies, won't work as expected in Nix. This commit implements a workaround that Lutris also employes for flatpaks where they unpack the image and then they run it. This is done via an environment variable passed to the Lutris executable. This commit also brings all dependencies needed for RPCS3 emulator to work as expected. --- pkgs/applications/misc/lutris/default.nix | 1 + pkgs/applications/misc/lutris/fhsenv.nix | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index f01be485ae05..914de95730aa 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -138,6 +138,7 @@ buildPythonApplication rec { dontWrapGApps = true; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath requiredTools}" + "--prefix APPIMAGE_EXTRACT_AND_RUN : 1" "\${gappsWrapperArgs[@]}" ]; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 5aa8f2ca3813..d4534e188610 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -34,6 +34,9 @@ in buildFHSEnv { targetPkgs = pkgs: with pkgs; [ lutris-unwrapped + # Appimages + fuse + # Adventure Game Studio allegro dumb @@ -86,9 +89,8 @@ in buildFHSEnv { # Redream // "redream is not available for the x86_64 architecture" - - # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..." - llvm + # RPCS3 + llvm e2fsprogs libgpg-error # ScummVM nasm sndio