From 56e280500ad208c675b259e4785250657358db07 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 31 Oct 2025 21:52:56 -0600
Subject: [PATCH 1/2] shadps4: 0.11.0 -> 0.12.5

https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.12.5
Diff: https://github.com/shadps4-emu/shadPS4/compare/v.0.11.0...v.0.12.5
---
 pkgs/by-name/sh/shadps4/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 088499c81e66..dfbaee7d32e7 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -21,7 +21,6 @@
   pipewire,
   pkg-config,
   pugixml,
-  qt6,
   rapidjson,
   renderdoc,
   robin-map,
@@ -29,6 +28,7 @@
   sndio,
   stb,
   toml11,
+  util-linux,
   vulkan-headers,
   vulkan-loader,
   vulkan-memory-allocator,
@@ -42,13 +42,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
-  version = "0.11.0";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "shadps4-emu";
     repo = "shadPS4";
     tag = "v.${finalAttrs.version}";
-    hash = "sha256-ZHgwFWSoEaWILTafet5iQvaLwLtXy3HuCxjkQMt4PBA=";
+    hash = "sha256-H/GOnArWxMe/90qgyLb9fXbeJabUOV8CjLtpGokoStQ=";
     fetchSubmodules = true;
   };
 
@@ -71,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     libgbm
     pipewire
     pugixml
-    qt6.qtbase
-    qt6.qtdeclarative
-    qt6.qtmultimedia
-    qt6.qttools
-    qt6.qtwayland
     rapidjson
     renderdoc
     robin-map
@@ -83,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     sndio
     stb
     toml11
+    util-linux
     vulkan-headers
     vulkan-loader
     vulkan-memory-allocator
@@ -95,11 +91,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qt6.wrapQtAppsHook
   ];
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT_GUI" true)
     (lib.cmakeBool "ENABLE_UPDATER" false)
   ];
 

From 8224f08f7c21b6c4df8f85c19ab58828c89adeb0 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 11 Nov 2025 16:32:06 -0700
Subject: [PATCH 2/2] shadps4: fix test

---
 nixos/tests/shadps4.nix | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/nixos/tests/shadps4.nix b/nixos/tests/shadps4.nix
index b6ac6397a642..76c282394dae 100644
--- a/nixos/tests/shadps4.nix
+++ b/nixos/tests/shadps4.nix
@@ -6,7 +6,7 @@
   };
 
   nodes.machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     {
       imports = [ ./common/x11.nix ];
 
@@ -80,37 +80,17 @@
 
     machine.wait_for_x()
 
-    with subtest("starting shadps4 works"):
-        machine.succeed("shadps4 >&2 &")
-        machine.wait_for_text("Directory to install games")
-        machine.screenshot("0001-shadps4-dir-setup-prompt")
-
-        machine.send_chars("/root\n")
-        machine.wait_for_text("Game List")
-        # Make it fullscreen, so mouse coords are simpler & content isn't cut off
-        machine.send_key("alt-f10")
-        # Should now see the rest too
-        machine.wait_for_text("Play Time")
-        machine.screenshot("0002-shadps4-started")
-
     with subtest("running example works"):
         # Ensure that chosen openorbis logo colour isn't present already
         assert (
             check_for_color(openorbisColor)(True) == False
         ), "openorbisColor {} was present on the screen before we launched anything!".format(openorbisColor)
 
-        machine.succeed("xdotool mousemove 20 30 click 1") # click on "File"
-        machine.wait_for_text("Boot Game")
-        machine.send_key("down")
-        machine.send_key("ret")
-
-        # Pick the PNG sample (hello world runs too, but text-only output is currently broken)
-        machine.wait_for_text("Look in")
-        machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin\n")
+        machine.succeed("shadps4 /etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin >&2 &")
 
         # Look for logo
         with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)):
             retry(check_for_color(openorbisColor))
-        machine.screenshot("0003-shadps4-sample-running")
+        machine.screenshot("0001-shadps4-sample-running")
   '';
 }