cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pcsx2: 1.7.4554 -> 1.7.4658

Browse source 
Diff: https://github.com/PCSX2/pcsx2/compare/v1.7.4554...v1.7.4653
This commit is contained in:
Martino Fontana 2023-06-28 13:38:58 +02:00
parent a565059a34
commit 4cf7913ef6
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/emulators/pcsx2/default.nix
View file

@ -1,11 +1,11 @@
{ cmake { cmake
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, stdenv , llvmPackages_16
, cubeb , cubeb
, curl , curl
, ffmpeg , ffmpeg
, fmt , fmt_8
, gettext , gettext
, harfbuzz , harfbuzz
, libaio , libaio
@ -37,25 +37,26 @@ let
pcsx2_patches = fetchFromGitHub { pcsx2_patches = fetchFromGitHub {
owner = "PCSX2"; owner = "PCSX2";
repo = "pcsx2_patches"; repo = "pcsx2_patches";
rev = "8db5ae467a35cc00dc50a65061aa78dc5115e6d1"; rev = "c09d842168689aeba88b656e3e0a042128673a7c";
sha256 = "sha256-68kD7IAhBMASFmkGwvyQ7ppO/3B1csAKik+rU792JI4="; sha256 = "sha256-h1jqv3a3Ib/4C7toZpSlVB1VFNNF1MrrUxttqKJL794=";
}; };
in in
stdenv.mkDerivation rec { llvmPackages_16.stdenv.mkDerivation rec {
pname = "pcsx2"; pname = "pcsx2";
version = "1.7.4554"; version = "1.7.4658";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PCSX2"; owner = "PCSX2";
repo = "pcsx2"; repo = "pcsx2";
fetchSubmodules = true; fetchSubmodules = true;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9MRbpm7JdVmZwv8zD4lErzVTm7A4tYM0FgXE9KpX+/8="; sha256 = "sha256-5y7CYFWgNh9oCBuTITvw7Rn4sC6MbMczVMAwtWFkn9A=";
}; };
cmakeFlags = [ cmakeFlags = [
"-DDISABLE_ADVANCE_SIMD=TRUE" "-DDISABLE_ADVANCE_SIMD=TRUE"
"-DUSE_SYSTEM_LIBS=ON" "-DUSE_SYSTEM_LIBS=ON"
"-DUSE_LINKED_FFMPEG=ON"
"-DDISABLE_BUILD_DATE=TRUE" "-DDISABLE_BUILD_DATE=TRUE"
]; ];
@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl curl
ffmpeg ffmpeg
fmt fmt_8
gettext gettext
harfbuzz harfbuzz
libaio libaio
@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp -a bin/pcsx2-qt bin/resources $out/bin/ cp -a bin/pcsx2-qt bin/resources $out/bin/
install -Dm644 $src/pcsx2/Resources/AppIcon64.png $out/share/pixmaps/PCSX2.png 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 install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/* zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
@ -107,7 +108,6 @@ stdenv.mkDerivation rec {
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([
ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
vulkan-loader vulkan-loader
] ++ cubeb.passthru.backendLibs)}" ] ++ cubeb.passthru.backendLibs)}"
]; ];