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

pcsx2: 2.3.424 -> 2.4.0; switch to stable (#421529)

parents 5d30429b e72fbae4

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

+4 −13
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
  libwebp,

  llvmPackages,

  lz4,

  makeWrapper,

  pkg-config,

  qt6,

  shaderc,
@@ -36,8 +35,8 @@ let 
  pcsx2_patches = fetchFromGitHub {

    owner = "PCSX2";

    repo = "pcsx2_patches";

    rev = "6448ff90bbf2fddb4498dcfdae0e6d3ec8c23479";

    hash = "sha256-ZXAZekllZHYjfU1q1QrbEdRlRAUAB6VOXLeAfn1GqW0=";

    rev = "9b193aa0a61f5e93d3bd4124b111e8f296ef9fa8";

    hash = "sha256-1hhdjFxJCNfeO/FIAnjRHESfiyzkErYddZqpRxzG7VQ=";

  };



  inherit (qt6)
@@ -50,13 +49,13 @@ let 
in

llvmPackages.stdenv.mkDerivation (finalAttrs: {

  pname = "pcsx2";

  version = "2.3.424";

  version = "2.4.0";

  src = fetchFromGitHub {

    pname = "pcsx2-source";

    owner = "PCSX2";

    repo = "pcsx2";

    tag = "v${finalAttrs.version}";

    hash = "sha256-EdFkSsat6O/1tXtJVHOPviseSaixd5LB1TNtfqhqR1E=";

    hash = "sha256-R+BdywkZKxR/+Z+o1512O3A1mg9A6s7i+JZjFyUbJVs=";

  };



  patches = [
@@ -134,14 +133,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { 
    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  # https://github.com/PCSX2/pcsx2/pull/10200

  # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run

  postFixup = ''

    source "${makeWrapper}/nix-support/setup-hook"

    wrapProgram $out/bin/pcsx2-qt \

      --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi'

  '';



  passthru = {

    inherit pcsx2_patches;

    updateScript.command = [ ./update.sh ];

pkgs/by-name/pc/pcsx2/update.sh

+8 −4
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

#!nix-shell -i bash -p bash nix-update common-updater-scripts coreutils jq



set -ex



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

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



update-source-version pcsx2 \

  --ignore-same-version \

  --rev=$latestRev \

  --rev=$latestPatchesRev \

  --source-key=pcsx2_patches

nix-update --version=unstable pcsx2
 


latestVersion="`curl "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" \

  | jq -r ".tag_name[1:]"`"



nix-update pcsx2 --version=$latestVersion