From 5034ff295423a3e0fcc6f29966bb0671ed8a4f25 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 1 Jun 2025 11:16:49 +0200
Subject: [PATCH] pcsx2: inline sources

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/pc/pcsx2/package.nix | 28 +++++++++++++++----
 pkgs/by-name/pc/pcsx2/sources.nix | 45 -------------------------------
 2 files changed, 23 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/pc/pcsx2/sources.nix

diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index 93a9b4974322..6fe842cec275 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   SDL2,
-  callPackage,
+  fetchFromGitHub,
   cmake,
   cubeb,
   curl,
@@ -28,7 +28,13 @@
 }:
 
 let
-  sources = callPackage ./sources.nix { };
+  pcsx2_patches = fetchFromGitHub {
+    owner = "PCSX2";
+    repo = "pcsx2_patches";
+    rev = "5cc1d09a72c0afcd04e2ca089a6b279108328fda";
+    hash = "sha256-or77ZsWU0YWtxj9LKJ/m8nDvKSyiF1sO140QaH6Jr64=";
+  };
+
   inherit (qt6)
     qtbase
     qtsvg
@@ -38,7 +44,15 @@ let
     ;
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
-  inherit (sources.pcsx2) pname version src;
+  pname = "pcsx2";
+  version = "2.3.39";
+  src = fetchFromGitHub {
+    pname = "pcsx2-source";
+    owner = "PCSX2";
+    repo = "pcsx2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Knlkf4GcN8OCgrd1nwdnYVCDA/7lyAfcoV4mLCkrHtg=";
+  };
 
   patches = [
     # Remove PCSX2_GIT_REV
@@ -51,7 +65,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "PACKAGE_MODE" true)
     (lib.cmakeBool "DISABLE_ADVANCE_SIMD" true)
     (lib.cmakeBool "USE_LINKED_FFMPEG" true)
-    (lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.rev)
+    (lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.tag)
   ];
 
   nativeBuildInputs = [
@@ -91,7 +105,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png
     install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
 
-    zip -jq $out/share/PCSX2/resources/patches.zip ${sources.pcsx2_patches.src}/patches/*
+    zip -jq $out/share/PCSX2/resources/patches.zip ${pcsx2_patches}/patches/*
     strip-nondeterminism $out/share/PCSX2/resources/patches.zip
   '';
 
@@ -112,6 +126,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi'
   '';
 
+  passthru = {
+    inherit pcsx2_patches;
+  };
+
   meta = {
     homepage = "https://pcsx2.net";
     description = "Playstation 2 emulator";
diff --git a/pkgs/by-name/pc/pcsx2/sources.nix b/pkgs/by-name/pc/pcsx2/sources.nix
deleted file mode 100644
index c3a210502c45..000000000000
--- a/pkgs/by-name/pc/pcsx2/sources.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-}:
-
-let
-  pcsx2 =
-    let
-      self = {
-        pname = "pcsx2";
-        version = "2.3.39";
-        src = fetchFromGitHub {
-          pname = "pcsx2-source";
-          inherit (self) version;
-          owner = "PCSX2";
-          repo = "pcsx2";
-          rev = "v${self.version}";
-          hash = "sha256-Knlkf4GcN8OCgrd1nwdnYVCDA/7lyAfcoV4mLCkrHtg=";
-        };
-      };
-    in
-    self;
-
-  # The pre-zipped files in releases don't have a versioned link, we need to zip
-  # them ourselves
-  pcsx2_patches =
-    let
-      self = {
-        pname = "pcsx2_patches";
-        version = "0-unstable-2024-11-23";
-        src = fetchFromGitHub {
-          pname = "pcsx2_patches-source";
-          inherit (self) version;
-          owner = "PCSX2";
-          repo = "pcsx2_patches";
-          rev = "5cc1d09a72c0afcd04e2ca089a6b279108328fda";
-          hash = "sha256-or77ZsWU0YWtxj9LKJ/m8nDvKSyiF1sO140QaH6Jr64=";
-        };
-      };
-    in
-    self;
-in
-{
-  inherit pcsx2 pcsx2_patches;
-}