diff options
Diffstat (limited to 'pkgs/by-name/rp/rpcs3/package.nix')
-rw-r--r-- | pkgs/by-name/rp/rpcs3/package.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 50e4a41c35772..a485423ad1fb4 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -28,14 +28,15 @@ , SDL2 , waylandSupport ? true , wayland +, wrapGAppsHook3 }: let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16648-71524271e"; - rpcs3Version = "0.0.32-16648-71524271e"; - rpcs3Revision = "71524271e948316d57515422bd0da0159a55d24d"; - rpcs3Hash = "sha256-uKzikzl33EBOjmLU3IML6CIfQbRaOs4NYZylSOVo9Dg="; + rpcs3GitVersion = "16833-981a1c56f"; + rpcs3Version = "0.0.32-16833-981a1c56f"; + rpcs3Revision = "981a1c56fbfb6056e5496bba9b8678a9dc755405"; + rpcs3Hash = "sha256-yRJ7RBRWm/HcdT/lw4t5AElsxujxFk0bA/keURCyQac="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in @@ -81,7 +82,9 @@ stdenv.mkDerivation { (lib.cmakeBool "USE_FAUDIO" faudioSupport) ]; - nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; + dontWrapGApps = true; + + nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg @@ -90,6 +93,10 @@ stdenv.mkDerivation { ++ lib.optional faudioSupport faudio ++ lib.optionals waylandSupport [ wayland qtwayland ]; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + postInstall = '' # Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration install -D ${./99-ds3-controllers.rules} $out/etc/udev/rules.d/99-ds3-controllers.rules |