diff options
| author | Christoph Hrdinka <c.github@hrdinka.at> | 2023-12-22 08:52:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-22 08:52:50 +0100 |
| commit | 17bb289ca09b682106756d17770b07c5fd8ccff0 (patch) | |
| tree | 094c5df9a37b4a871f8ad9dfec9df3821693ac7c /pkgs/applications/emulators | |
| parent | 5c7b6fb51c10fda4cf9f91eb34685ac82bab6fc1 (diff) | |
| parent | 97ae679e7fccad1003a3bfd72664aa2d13245130 (diff) | |
| download | nixlib-17bb289ca09b682106756d17770b07c5fd8ccff0.tar nixlib-17bb289ca09b682106756d17770b07c5fd8ccff0.tar.gz nixlib-17bb289ca09b682106756d17770b07c5fd8ccff0.tar.bz2 nixlib-17bb289ca09b682106756d17770b07c5fd8ccff0.tar.lz nixlib-17bb289ca09b682106756d17770b07c5fd8ccff0.tar.xz nixlib-17bb289ca09b682106756d17770b07c5fd8ccff0.tar.zst nixlib-17bb289ca09b682106756d17770b07c5fd8ccff0.zip | |
Merge pull request #273330 from SuperSamus/pcsx2-update
pcsx2: 1.7.5004 -> 1.7.5318
Diffstat (limited to 'pkgs/applications/emulators')
| -rw-r--r-- | pkgs/applications/emulators/pcsx2/default.nix | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 9a18bf968582..36bcae419654 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -1,12 +1,11 @@ { cmake , fetchFromGitHub , lib -, llvmPackages_16 +, llvmPackages_17 , cubeb , curl , extra-cmake-modules , ffmpeg -, fmt_8 , gettext , harfbuzz , libaio @@ -15,12 +14,12 @@ , libsamplerate , libXrandr , libzip +, makeWrapper , pkg-config , qtbase , qtsvg , qttools , qtwayland -, rapidyaml , SDL2 , soundtouch , strip-nondeterminism @@ -37,27 +36,26 @@ let pcsx2_patches = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2_patches"; - rev = "04d727b3bf451da11b6594602036e4f7f5580610"; - sha256 = "sha256-zrulsSMRNLPFvrC/jeYzl53i4ZvFQ4Yl2nB0bA6Y8KU="; + rev = "42d7ee72b66955e3bbd2caaeaa855f605b463722"; + sha256 = "sha256-Zd+Aeps2IWVX2fS1Vyczv/wAX8Z89XnCH1eqSPdYEw8="; }; in -llvmPackages_16.stdenv.mkDerivation rec { +llvmPackages_17.stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.5004"; + version = "1.7.5318"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-o+9VSuoZgTkS75rZ6qYM8ITD+0OcwXp+xh/hdUGpVK4="; + sha256 = "sha256-5SUlq3HQAzROG1yncA4u4XGVv+1I+s9FQ6LgJkiLSD0="; }; cmakeFlags = [ - "-DDISABLE_ADVANCE_SIMD=TRUE" - "-DUSE_SYSTEM_LIBS=ON" + "-DDISABLE_ADVANCE_SIMD=ON" "-DUSE_LINKED_FFMPEG=ON" - "-DDISABLE_BUILD_DATE=TRUE" + "-DDISABLE_BUILD_DATE=ON" ]; nativeBuildInputs = [ @@ -72,7 +70,6 @@ llvmPackages_16.stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg - fmt_8 gettext harfbuzz libaio @@ -85,7 +82,6 @@ llvmPackages_16.stdenv.mkDerivation rec { qtsvg qttools qtwayland - rapidyaml SDL2 soundtouch vulkan-headers @@ -106,11 +102,22 @@ llvmPackages_16.stdenv.mkDerivation rec { strip-nondeterminism $out/bin/resources/patches.zip ''; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ - vulkan-loader - ] ++ cubeb.passthru.backendLibs)}" - ]; + qtWrapperArgs = + let + libs = lib.makeLibraryPath ([ + vulkan-loader + ] ++ cubeb.passthru.backendLibs); + in [ + "--prefix LD_LIBRARY_PATH : ${libs}" + ]; + + # 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' + ''; meta = with lib; { description = "Playstation 2 emulator"; |