BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #164741 from SuperSamus/pcsx2

Browse source 
pcsx2: 1.7.2105 -> 1.7.2731, support Vulkan
This commit is contained in:
ajs124 2022-05-11 09:40:16 +01:00 committed by GitHub
commit 6936329cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,9 @@
, libpng , libpng
, libpulseaudio , libpulseaudio
, libsamplerate , libsamplerate
, libxml2 , libXdmcp
, openssl
, pcre
, perl , perl
, pkg-config , pkg-config
, portaudio , portaudio
@ -20,6 +22,8 @@
, soundtouch , soundtouch
, stdenv , stdenv
, udev , udev
, vulkan-headers
, vulkan-loader
, wrapGAppsHook , wrapGAppsHook
, wxGTK , wxGTK
, zlib , zlib
@ -28,14 +32,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pcsx2"; pname = "pcsx2";
version = "1.7.2105"; version = "1.7.2731";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PCSX2"; owner = "PCSX2";
repo = "pcsx2"; repo = "pcsx2";
fetchSubmodules = true; fetchSubmodules = true;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk="; hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo=";
}; };
cmakeFlags = [ cmakeFlags = [
@ -44,9 +48,10 @@ stdenv.mkDerivation rec {
"-DPACKAGE_MODE=TRUE" "-DPACKAGE_MODE=TRUE"
"-DWAYLAND_API=TRUE" "-DWAYLAND_API=TRUE"
"-DXDG_STD=TRUE" "-DXDG_STD=TRUE"
"-DUSE_VULKAN=TRUE"
]; ];
nativeBuildInputs = [ cmake perl pkg-config wrapGAppsHook ]; nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ];
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
@ -60,16 +65,29 @@ stdenv.mkDerivation rec {
libpng libpng
libpulseaudio libpulseaudio
libsamplerate libsamplerate
libxml2 libXdmcp
openssl
pcre
portaudio portaudio
SDL2 SDL2
soundtouch soundtouch
udev udev
vulkan-loader
wayland wayland
wxGTK wxGTK
zlib 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; { meta = with lib; {
description = "Playstation 2 emulator"; description = "Playstation 2 emulator";
longDescription = '' longDescription = ''
@ -81,13 +99,12 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://pcsx2.net"; homepage = "https://pcsx2.net";
maintainers = with maintainers; [ hrdinka govanify ]; maintainers = with maintainers; [ hrdinka govanify ];
mainProgram = "PCSX2";
# PCSX2's source code is released under LGPLv3+. It However ships # PCSX2's source code is released under LGPLv3+. It However ships
# additional data files and code that are licensed differently. # additional data files and code that are licensed differently.
# This might be solved in future, for now we should stick with # This might be solved in future, for now we should stick with
# license.free # license.free
license = licenses.free; license = licenses.free;
platforms = platforms.x86; platforms = platforms.x86_64;
}; };
} }