Unverified Commit f485a200 authored by Matteo Pacini's avatar Matteo Pacini Committed by GitHub
Browse files

pcsx2: 2.3.39 -> 2.3.407 (#414762)

parents 75c9bbec 5b226370
Loading
Loading
Loading
Loading
+32 −7
Original line number Diff line number Diff line
{
  lib,
  SDL2,
  callPackage,
  fetchFromGitHub,
  sdl3,
  cmake,
  cubeb,
  curl,
@@ -25,10 +25,19 @@
  wayland,
  zip,
  zstd,
  plutovg,
  plutosvg,
  kddockwidgets,
}:

let
  sources = callPackage ./sources.nix { };
  pcsx2_patches = fetchFromGitHub {
    owner = "PCSX2";
    repo = "pcsx2_patches";
    rev = "49d2f7bb0b4387e9cb7c68233e2bdc156850542b";
    hash = "sha256-WByW40lf5h1hlnxxiiP9WyEhk8NwxATZDguWQj+j3iA=";
  };

  inherit (qt6)
    qtbase
    qtsvg
@@ -38,7 +47,15 @@ let
    ;
in
llvmPackages.stdenv.mkDerivation (finalAttrs: {
  inherit (sources.pcsx2) pname version src;
  pname = "pcsx2";
  version = "2.3.407";
  src = fetchFromGitHub {
    pname = "pcsx2-source";
    owner = "PCSX2";
    repo = "pcsx2";
    tag = "v${finalAttrs.version}";
    hash = "sha256-3/nnGdEr7flA8g9jPC8clAyvZlwQh12/YH4+t0O9OuU=";
  };

  patches = [
    # Remove PCSX2_GIT_REV
@@ -51,7 +68,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 = [
@@ -76,7 +93,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
    qtsvg
    qttools
    qtwayland
    SDL2
    sdl3
    plutovg
    plutosvg
    kddockwidgets
    shaderc
    soundtouch
    vulkan-headers
@@ -91,7 +111,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 +132,11 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
      --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi'
  '';

  passthru = {
    inherit pcsx2_patches;
    updateScript.command = [ ./update.sh ];
  };

  meta = {
    homepage = "https://pcsx2.net";
    description = "Playstation 2 emulator";

pkgs/by-name/pc/pcsx2/sources.nix

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line
{
  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;
}
+12 −0
Original line number Diff line number Diff line
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash nix-update common-updater-scripts coreutils

set -ex

latestRev=`git ls-remote -b https://github.com/PCSX2/pcsx2_patches main | cut -f1`

update-source-version pcsx2 \
  --ignore-same-version \
  --rev=$latestRev \
  --source-key=pcsx2_patches
nix-update --version=unstable pcsx2
+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  nix-update-script,
  validatePkgConfig,
  testers,
@@ -28,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
  patches = [
    # https://github.com/sammycage/plutosvg/pull/29
    ./0001-Emit-correct-pkg-config-file-if-paths-are-absolute.patch
    # https://github.com/sammycage/plutosvg/pull/31
    (fetchpatch {
      url = "https://github.com/sammycage/plutosvg/commit/17d60020e0b24299fae0e7df37637448b3b51488.patch";
      hash = "sha256-hY25ttsLQwvtQmDeOGSoCVDy34GUA0tNai/L3wpmPUo=";
    })
  ];

  nativeBuildInputs = [