From 6e7747792622ca7fcbcb16d262aa91d17542b3bd Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 4 Aug 2024 17:30:05 -0500
Subject: [PATCH 1/2] chiaki4deck: rename to chiaki-ng

---
 pkgs/games/{chiaki4deck => chiaki-ng}/default.nix | 6 +++---
 pkgs/top-level/aliases.nix                        | 1 +
 pkgs/top-level/all-packages.nix                   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename pkgs/games/{chiaki4deck => chiaki-ng}/default.nix (95%)

diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki-ng/default.nix
similarity index 95%
rename from pkgs/games/chiaki4deck/default.nix
rename to pkgs/games/chiaki-ng/default.nix
index 509fa9eccb22..54034e4b4dd1 100644
--- a/pkgs/games/chiaki4deck/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -35,12 +35,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "chiaki4deck";
+  pname = "chiaki-ng";
   version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "streetpea";
-    repo = pname;
+    repo = "chiaki-ng";
     rev = "v${version}";
     hash = "sha256-9EF+Mm6nZeo3XYH8KO7e22cJ4e9TWUEinhkm+Z213RU=";
     fetchSubmodules = true;
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://streetpea.github.io/chiaki4deck/";
+    homepage = "https://streetpea.github.io/chiaki-ng/";
     description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck";
     # Includes OpenSSL linking exception that we currently have no way
     # to represent.
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a97ab1c0c949..1e0cdeeef0cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -225,6 +225,7 @@ mapAliases ({
   chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
   chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
   chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
+  chiaki4deck = chiaki-ng; # Added 2024-08-04
   chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08
   chocolateDoom = chocolate-doom; # Added 2023-05-01
   ChowCentaur = chow-centaur; # Added 2024-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bff116702190..84610d9d8925 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35928,7 +35928,7 @@ with pkgs;
 
   chiaki = libsForQt5.callPackage ../games/chiaki { };
 
-  chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { };
+  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
 
   chromium-bsu = callPackage ../games/chromium-bsu { };
 

From 7b1f1f77ebaf3e9d8e39512f8c3f6b26a60db483 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 4 Aug 2024 17:34:28 -0500
Subject: [PATCH 2/2] chiaki-ng: 1.7.4 -> 1.8.1

---
 pkgs/games/chiaki-ng/default.nix |  7 +++----
 pkgs/top-level/all-packages.nix  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix
index 54034e4b4dd1..cc183cb7c1da 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -1,6 +1,5 @@
 { lib
 , fetchFromGitHub
-, fetchpatch2
 , stdenv
 , cmake
 , pkg-config
@@ -36,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "chiaki-ng";
-  version = "1.7.4";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
     rev = "v${version}";
-    hash = "sha256-9EF+Mm6nZeo3XYH8KO7e22cJ4e9TWUEinhkm+Z213RU=";
+    hash = "sha256-wYshjduufxTxLzU2462ZRCj9WP/PZoJUOC/kGzus8ew=";
     fetchSubmodules = true;
   };
 
@@ -114,7 +113,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://streetpea.github.io/chiaki-ng/";
-    description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck";
+    description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)";
     # Includes OpenSSL linking exception that we currently have no way
     # to represent.
     #
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84610d9d8925..3c53afedbcc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35928,7 +35928,16 @@ with pkgs;
 
   chiaki = libsForQt5.callPackage ../games/chiaki { };
 
-  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
+  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng {
+    libplacebo = libplacebo.overrideAttrs (old: {
+      version = "6.338.2-unstable-2024-01-29";
+      src = old.src.override {
+        # broken with 7.349.0 -- pinning to rev used by upstream https://github.com/streetpea/chiaki-ng/blob/96d535db41bb9c3b37fbffcf2402d51e891ff960/scripts/build-libplacebo.sh#L9
+        rev = "c320f61e601caef2be081ce61138e5d51c1be21d";
+        hash = "sha256-ZlKYgWz/Rkp4IPt6cJ+KNnzBB2s8jGZEamSAOIGyDuE=";
+      };
+    });
+  };
 
   chromium-bsu = callPackage ../games/chromium-bsu { };