From 2834aef384ccba94a1368a54148a0815aa543c53 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <matteo@codecraft.it>
Date: Sat, 20 Jul 2024 10:08:24 +0100
Subject: [PATCH 1/2] pcsx2-bin: derivation improvements

---
 pkgs/by-name/pc/pcsx2-bin/package.nix | 33 +++++++++++++++------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index ec71fc9955ec..c30d5f4cd50c 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -3,12 +3,10 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  # To grab metadata
-  pcsx2,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "pcsx2";
+  pname = "pcsx2-bin";
   version = "1.7.5919";
 
   src = fetchurl {
@@ -26,9 +24,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/{bin,Applications}
+    mkdir -p $out/Applications
     cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app
-    makeWrapper $out/Applications/PCSX2.app/Contents/MacOS/PCSX2 $out/bin/pcsx2-qt
     runHook postInstall
   '';
 
@@ -37,17 +34,23 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    inherit (pcsx2.meta)
-      homepage
-      longDescription
-      license
-      changelog
-      downloadPage
-      ;
-    description = "Playstation 2 emulator; precompiled binary for MacOS, repacked from official website";
+    homepage = "https://pcsx2.net";
+    description = "Playstation 2 emulator (precompiled binary, repacked from official website)";
+    longDescription = ''
+      PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose is
+      to emulate the PS2 hardware, using a combination of MIPS CPU Interpreters,
+      Recompilers and a Virtual Machine which manages hardware states and PS2
+      system memory. This allows you to play PS2 games on your PC, with many
+      additional features and benefits.
+    '';
+    changelog = "https://github.com/PCSX2/pcsx2/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/PCSX2/pcsx2";
+    license = with lib.licenses; [
+      gpl3Plus
+      lgpl3Plus
+    ];
     maintainers = with lib.maintainers; [ matteopacini ];
-    mainProgram = "pcsx2-qt";
-    platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isDarwin lib.systems.inspect.patterns.isx86_64;
+    platforms = [ "x86_64-darwin" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

From 88011bc9bd49c6f4c01c8cb198971cea9c03540e Mon Sep 17 00:00:00 2001
From: Matteo Pacini <matteo@codecraft.it>
Date: Sat, 20 Jul 2024 10:09:00 +0100
Subject: [PATCH 2/2] pcsx2-bin: 1.7.5919 -> 2.1.17

---
 pkgs/by-name/pc/pcsx2-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index c30d5f4cd50c..cb38ebac1c76 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pcsx2-bin";
-  version = "1.7.5919";
+  version = "2.1.17";
 
   src = fetchurl {
     url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
-    hash = "sha256-NYgHsYXoIhI2pxqqiMgz5sKBAezEFf4AfEfu5S3diMg=";
+    hash = "sha256-WuxvMcGuCyTAc99JkUjG0qcV7SXWy9fmaZR0+8iGepQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];