Unverified Commit 53c58a23 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #240328 from SuperSamus/pcsx2

parents 6103a665 4cf7913e

pkgs/applications/emulators/pcsx2/default.nix

+10 −10
Original line number Diff line number Diff line 
{ cmake

, fetchFromGitHub

, lib

, stdenv

, llvmPackages_16

, cubeb

, curl

, ffmpeg

, fmt

, fmt_8

, gettext

, harfbuzz

, libaio
@@ -37,25 +37,26 @@ let 
  pcsx2_patches = fetchFromGitHub {

    owner = "PCSX2";

    repo = "pcsx2_patches";

    rev = "8db5ae467a35cc00dc50a65061aa78dc5115e6d1";

    sha256 = "sha256-68kD7IAhBMASFmkGwvyQ7ppO/3B1csAKik+rU792JI4=";

    rev = "c09d842168689aeba88b656e3e0a042128673a7c";

    sha256 = "sha256-h1jqv3a3Ib/4C7toZpSlVB1VFNNF1MrrUxttqKJL794=";

  };

in

stdenv.mkDerivation rec {

llvmPackages_16.stdenv.mkDerivation rec {

  pname = "pcsx2";

  version = "1.7.4554";

  version = "1.7.4658";



  src = fetchFromGitHub {

    owner = "PCSX2";

    repo = "pcsx2";

    fetchSubmodules = true;

    rev = "v${version}";

    sha256 = "sha256-9MRbpm7JdVmZwv8zD4lErzVTm7A4tYM0FgXE9KpX+/8=";

    sha256 = "sha256-5y7CYFWgNh9oCBuTITvw7Rn4sC6MbMczVMAwtWFkn9A=";

  };



  cmakeFlags = [

    "-DDISABLE_ADVANCE_SIMD=TRUE"

    "-DUSE_SYSTEM_LIBS=ON"

    "-DUSE_LINKED_FFMPEG=ON"

    "-DDISABLE_BUILD_DATE=TRUE"

  ];
@@ -70,7 +71,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    curl

    ffmpeg

    fmt

    fmt_8

    gettext

    harfbuzz

    libaio
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec { 
    mkdir -p $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



    zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
@@ -107,7 +108,6 @@ stdenv.mkDerivation rec { 


  qtWrapperArgs = [

    "--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

    ] ++ cubeb.passthru.backendLibs)}"

  ];