Merge pull request #164741 from SuperSamus/pcsx2

pcsx2: 1.7.2105 -> 1.7.2731, support Vulkan

authored by

ajs124 and committed by
GitHub
6936329c 08dc9072

+24 -7
+24 -7
pkgs/applications/emulators/pcsx2/default.nix
··· 12 12 , libpng 13 13 , libpulseaudio 14 14 , libsamplerate 15 - , libxml2 15 + , libXdmcp 16 + , openssl 17 + , pcre 16 18 , perl 17 19 , pkg-config 18 20 , portaudio ··· 20 22 , soundtouch 21 23 , stdenv 22 24 , udev 25 + , vulkan-headers 26 + , vulkan-loader 23 27 , wrapGAppsHook 24 28 , wxGTK 25 29 , zlib ··· 28 32 29 33 stdenv.mkDerivation rec { 30 34 pname = "pcsx2"; 31 - version = "1.7.2105"; 35 + version = "1.7.2731"; 32 36 33 37 src = fetchFromGitHub { 34 38 owner = "PCSX2"; 35 39 repo = "pcsx2"; 36 40 fetchSubmodules = true; 37 41 rev = "v${version}"; 38 - hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk="; 42 + hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo="; 39 43 }; 40 44 41 45 cmakeFlags = [ ··· 44 48 "-DPACKAGE_MODE=TRUE" 45 49 "-DWAYLAND_API=TRUE" 46 50 "-DXDG_STD=TRUE" 51 + "-DUSE_VULKAN=TRUE" 47 52 ]; 48 53 49 - nativeBuildInputs = [ cmake perl pkg-config wrapGAppsHook ]; 54 + nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ]; 50 55 51 56 buildInputs = [ 52 57 alsa-lib ··· 60 65 libpng 61 66 libpulseaudio 62 67 libsamplerate 63 - libxml2 68 + libXdmcp 69 + openssl 70 + pcre 64 71 portaudio 65 72 SDL2 66 73 soundtouch 67 74 udev 75 + vulkan-loader 68 76 wayland 69 77 wxGTK 70 78 zlib 71 79 ]; 72 80 81 + # Wayland doesn't seem to work right now (crashes when booting a game). 82 + # Try removing `--prefix GDK_BACKEND : x11` on the next update. 83 + # (This may be solved when the project finshes migrating to Qt) 84 + preFixup = '' 85 + gappsWrapperArgs+=( 86 + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} 87 + --prefix GDK_BACKEND : x11 88 + ) 89 + ''; 90 + 73 91 meta = with lib; { 74 92 description = "Playstation 2 emulator"; 75 93 longDescription = '' ··· 81 99 ''; 82 100 homepage = "https://pcsx2.net"; 83 101 maintainers = with maintainers; [ hrdinka govanify ]; 84 - mainProgram = "PCSX2"; 85 102 86 103 # PCSX2's source code is released under LGPLv3+. It However ships 87 104 # additional data files and code that are licensed differently. 88 105 # This might be solved in future, for now we should stick with 89 106 # license.free 90 107 license = licenses.free; 91 - platforms = platforms.x86; 108 + platforms = platforms.x86_64; 92 109 }; 93 110 }