From 4310884afc21f3f4c9de97eb0aef2acfd171084d Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 10 Jan 2026 00:09:29 +0100
Subject: [PATCH] rpcs3: 0.0.38 -> 0.0.39-unstable-2026-01-15

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/rp/rpcs3/package.nix | 34 ++++++++++++-------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 850b25968ca2..b192f4ccfb7d 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   fetchFromGitHub,
   nix-update-script,
   cmake,
@@ -14,7 +13,7 @@
   vulkan-loader,
   libpng,
   libSM,
-  ffmpeg_7,
+  ffmpeg,
   libevdev,
   libusb1,
   zlib,
@@ -29,14 +28,12 @@
   enableDiscordRpc ? false,
   faudioSupport ? true,
   faudio,
-  SDL2,
   sdl3,
   waylandSupport ? true,
   wayland,
   wrapGAppsHook3,
   miniupnpc,
   rtmidi,
-  asmjit,
   glslang,
   zstd,
   hidapi,
@@ -53,21 +50,26 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpcs3";
-  version = "0.0.38";
+  version = "0.0.39-unstable-2026-01-15";
 
   src = fetchFromGitHub {
     owner = "RPCS3";
     repo = "rpcs3";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-HaguOzCN0/FvAb0b4RZWnw9yvVum14wEj26WnqOnSag=";
-    fetchSubmodules = true;
+    rev = "eaebd3426e7050c35beb8f24952d6da4d6a75360";
+    postCheckout = ''
+      cd $out/3rdparty
+      git submodule update --init \
+        fusion/fusion asmjit/asmjit yaml-cpp/yaml-cpp SoundTouch/soundtouch stblib/stb \
+        feralinteractive/feralinteractive
+    '';
+    hash = "sha256-iE7iZ66BSWI96a9DOeBQEx6NV+CtIyX0PXg3O2RXHWY=";
   };
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   preConfigure = ''
     cat > ./rpcs3/git-version.h <<EOF
-    #define RPCS3_GIT_VERSION "nixpkgs"
+    #define RPCS3_GIT_VERSION "nixpkgs-${lib.sources.shortRev finalAttrs.src.rev}"
     #define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master"
     #define RPCS3_GIT_BRANCH "HEAD"
     #define RPCS3_GIT_VERSION_NO_UPDATE 1
@@ -120,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
     vulkan-loader
     libpng
-    ffmpeg_7
+    ffmpeg
     libevdev
     zlib
     libusb1
@@ -128,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
     wolfssl
     python3
     pugixml
-    SDL2 # Still needed by FAudio's CMake
     sdl3
     flatbuffers
     llvm_18
@@ -137,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
     cubeb
     miniupnpc
     rtmidi
-    asmjit
     glslang
     zstd
     hidapi
@@ -149,14 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
     qtwayland
   ];
 
-  patches = [
-    (fetchpatch {
-      name = "fix-build-qt-6.10.patch";
-      url = "https://github.com/RPCS3/rpcs3/commit/038ee090b731bf63917371a3586c2f7d7cf4e585.patch";
-      hash = "sha256-jTIxsheG9b9zp0JEeWQ73BunAXmEIg5tj4SrWBfdHy8=";
-    })
-  ];
-
   doInstallCheck = true;
 
   preFixup = ''