diff options
author | Martino Fontana <tinozzo123@tutanota.com> | 2022-03-18 12:54:53 +0100 |
---|---|---|
committer | Martino Fontana <tinozzo123@tutanota.com> | 2022-05-10 22:23:50 +0200 |
commit | e0cd2c540a93715c388f4b8d7ebcb107be8a2477 (patch) | |
tree | a75719f6df664e2951ac363d819bc8157df85b9c /pkgs/applications/emulators/pcsx2 | |
parent | cbe587c735b734405f56803e267820ee1559e6c1 (diff) |
pcsx2: 1.7.2105 -> 1.7.2731, support Vulkan
Diffstat (limited to 'pkgs/applications/emulators/pcsx2')
-rw-r--r-- | pkgs/applications/emulators/pcsx2/default.nix | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 2e22e7d9053a..a5ff1106fd68 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -12,7 +12,9 @@ , libpng , libpulseaudio , libsamplerate -, libxml2 +, libXdmcp +, openssl +, pcre , perl , pkg-config , portaudio @@ -20,6 +22,8 @@ , soundtouch , stdenv , udev +, vulkan-headers +, vulkan-loader , wrapGAppsHook , wxGTK , zlib @@ -28,14 +32,14 @@ stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.2105"; + version = "1.7.2731"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk="; + hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo="; }; cmakeFlags = [ @@ -44,9 +48,10 @@ stdenv.mkDerivation rec { "-DPACKAGE_MODE=TRUE" "-DWAYLAND_API=TRUE" "-DXDG_STD=TRUE" + "-DUSE_VULKAN=TRUE" ]; - nativeBuildInputs = [ cmake perl pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ]; buildInputs = [ alsa-lib @@ -60,16 +65,29 @@ stdenv.mkDerivation rec { libpng libpulseaudio libsamplerate - libxml2 + libXdmcp + openssl + pcre portaudio SDL2 soundtouch udev + vulkan-loader wayland wxGTK zlib ]; + # Wayland doesn't seem to work right now (crashes when booting a game). + # Try removing `--prefix GDK_BACKEND : x11` on the next update. + # (This may be solved when the project finshes migrating to Qt) + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} + --prefix GDK_BACKEND : x11 + ) + ''; + meta = with lib; { description = "Playstation 2 emulator"; longDescription = '' @@ -81,13 +99,12 @@ stdenv.mkDerivation rec { ''; homepage = "https://pcsx2.net"; maintainers = with maintainers; [ hrdinka govanify ]; - mainProgram = "PCSX2"; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. # This might be solved in future, for now we should stick with # license.free license = licenses.free; - platforms = platforms.x86; + platforms = platforms.x86_64; }; } |