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