From 4076d988121889c6caeec208f790abe5363a08b6 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Thu, 23 Nov 2023 02:30:37 +1000
Subject: [PATCH] rpcs3: 0.0.28-15409-fd6829f75 -> 0.0.29-15726-ebf48800e

Also convert to pkgs/by-name.

Closes #268112
---
 .../rp}/rpcs3/99-ds3-controllers.rules          |  0
 .../rp}/rpcs3/99-ds4-controllers.rules          |  0
 .../rp}/rpcs3/99-dualsense-controllers.rules    |  0
 .../rp/rpcs3/package.nix}                       | 17 ++++++++---------
 .../emulators => by-name/rp}/rpcs3/update.sh    |  2 +-
 pkgs/top-level/all-packages.nix                 |  2 --
 6 files changed, 9 insertions(+), 12 deletions(-)
 rename pkgs/{applications/emulators => by-name/rp}/rpcs3/99-ds3-controllers.rules (100%)
 rename pkgs/{applications/emulators => by-name/rp}/rpcs3/99-ds4-controllers.rules (100%)
 rename pkgs/{applications/emulators => by-name/rp}/rpcs3/99-dualsense-controllers.rules (100%)
 rename pkgs/{applications/emulators/rpcs3/default.nix => by-name/rp/rpcs3/package.nix} (86%)
 rename pkgs/{applications/emulators => by-name/rp}/rpcs3/update.sh (98%)

diff --git a/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules b/pkgs/by-name/rp/rpcs3/99-ds3-controllers.rules
similarity index 100%
rename from pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules
rename to pkgs/by-name/rp/rpcs3/99-ds3-controllers.rules
diff --git a/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules b/pkgs/by-name/rp/rpcs3/99-ds4-controllers.rules
similarity index 100%
rename from pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules
rename to pkgs/by-name/rp/rpcs3/99-ds4-controllers.rules
diff --git a/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules b/pkgs/by-name/rp/rpcs3/99-dualsense-controllers.rules
similarity index 100%
rename from pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules
rename to pkgs/by-name/rp/rpcs3/99-dualsense-controllers.rules
diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/by-name/rp/rpcs3/package.nix
similarity index 86%
rename from pkgs/applications/emulators/rpcs3/default.nix
rename to pkgs/by-name/rp/rpcs3/package.nix
index 88b3ddbb1750..ef87774636b2 100644
--- a/pkgs/applications/emulators/rpcs3/default.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -1,13 +1,10 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, wrapQtAppsHook
 , cmake
 , pkg-config
 , git
-, qtbase
-, qtquickcontrols
-, qtmultimedia
+, qt6Packages
 , openal
 , glew
 , vulkan-headers
@@ -34,10 +31,12 @@
 
 let
   # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "15409-fd6829f75";
-  rpcs3Version = "0.0.28-15409-fd6829f75";
-  rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c";
-  rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk=";
+  rpcs3GitVersion = "15726-ebf48800e";
+  rpcs3Version = "0.0.29-15726-ebf48800e";
+  rpcs3Revision = "ebf48800e6bf2569fa0a59974ab2daaeb3a92f23";
+  rpcs3Hash = "sha256-HJQ+DCZy8lwMCfq0N9StKD8bP1hCBxGMAucbQ9esy/I=";
+
+  inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook;
 in
 stdenv.mkDerivation {
   pname = "rpcs3";
@@ -82,7 +81,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ];
 
   buildInputs = [
-    qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
+    qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
     libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM
   ] ++ cubeb.passthru.backendLibs
     ++ lib.optionals faudioSupport [ faudio SDL2 ]
diff --git a/pkgs/applications/emulators/rpcs3/update.sh b/pkgs/by-name/rp/rpcs3/update.sh
similarity index 98%
rename from pkgs/applications/emulators/rpcs3/update.sh
rename to pkgs/by-name/rp/rpcs3/update.sh
index 1efecc7ec88c..8eb3752a460d 100755
--- a/pkgs/applications/emulators/rpcs3/update.sh
+++ b/pkgs/by-name/rp/rpcs3/update.sh
@@ -57,4 +57,4 @@ sed -i -E \
     -e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \
     -e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \
     -e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \
-    "$ROOT/default.nix"
+    "$ROOT/package.nix"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91f03dc3bbde..acf2d07f70d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2802,8 +2802,6 @@ with pkgs;
 
   rpcemu = callPackage ../applications/emulators/rpcemu { };
 
-  rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { };
-
   ruffle = callPackage ../applications/emulators/ruffle { };
 
   ryujinx = callPackage ../applications/emulators/ryujinx { };