diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki-ng/default.nix similarity index 86% rename from pkgs/games/chiaki4deck/default.nix rename to pkgs/games/chiaki-ng/default.nix index 509fa9eccb22..cc183cb7c1da 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch2 , stdenv , cmake , pkg-config @@ -35,14 +34,14 @@ }: stdenv.mkDerivation rec { - pname = "chiaki4deck"; - version = "1.7.4"; + pname = "chiaki-ng"; + version = "1.8.1"; src = fetchFromGitHub { owner = "streetpea"; - repo = pname; + repo = "chiaki-ng"; rev = "v${version}"; - hash = "sha256-9EF+Mm6nZeo3XYH8KO7e22cJ4e9TWUEinhkm+Z213RU="; + hash = "sha256-wYshjduufxTxLzU2462ZRCj9WP/PZoJUOC/kGzus8ew="; fetchSubmodules = true; }; @@ -113,8 +112,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://streetpea.github.io/chiaki4deck/"; - description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck"; + homepage = "https://streetpea.github.io/chiaki-ng/"; + 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/aliases.nix b/pkgs/top-level/aliases.nix index 65ac0671b249..ac453a5a28b4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -227,6 +227,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 f224b59658bf..ccd435865fad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35424,7 +35424,16 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { }; + 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 { };