public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91762 from smgb66/fix/rpcs3-vulkan

Browse Source 
rpcs3: fix vulkan renderer
This commit is contained in:
Jörg Thalheim 2020-06-29 19:24:17 +01:00 committed by GitHub
commit f3ee2cdb31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/misc/emulators/rpcs3/default.nix
View File

@ -1,5 +1,6 @@
{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git { mkDerivation, lib, fetchgit, cmake, pkgconfig, git
, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg_3, libevdev, python3 , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng
, ffmpeg, libevdev, python3
, pulseaudioSupport ? true, libpulseaudio , pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland , waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib , alsaSupport ? true, alsaLib
@ -15,7 +16,7 @@ mkDerivation {
src = fetchgit { src = fetchgit {
url = "https://github.com/RPCS3/rpcs3"; url = "https://github.com/RPCS3/rpcs3";
rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"; rev = "v${majorVersion}";
sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1";
}; };
@ -36,7 +37,8 @@ mkDerivation {
nativeBuildInputs = [ cmake pkgconfig git ]; nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = [ buildInputs = [
qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg_3 libevdev python3 qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg
libevdev python3
] ++ lib.optional pulseaudioSupport libpulseaudio ] ++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib ++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland; ++ lib.optional waylandSupport wayland;