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

Merge pull request #82998 from OPNA2608/update-rpcs3

Browse Source 
rpcs3: 0.0.6-8187-790962425 -> 0.0.8-9300-341fdf7eb
This commit is contained in:
Benjamin Hipple 2020-03-27 21:57:07 -04:00 committed by GitHub
commit b96cdee097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,22 @@
{ stdenv, lib, fetchgit, cmake, pkgconfig, git
, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27
{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git
, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python3
, pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib
}:
let
majorVersion = "0.0.6";
gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
majorVersion = "0.0.8";
gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in
stdenv.mkDerivation {
mkDerivation {
pname = "rpcs3";
version = "${majorVersion}-${gitVersion}";
src = fetchgit {
url = "https://github.com/RPCS3/rpcs3";
rev = "790962425cfb893529f72b3ef0dd1424fcc42973";
sha256 = "154ys29b9xdws3bp4b7rb3kc0h9hd49g2yf3z9268cdq8aclahaa";
rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd";
sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1";
};
preConfigure = ''
@ -36,14 +36,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = [
qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27
qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python3
] ++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland;
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "PS3 emulator/debugger";
homepage = "https://rpcs3.net/";
maintainers = with maintainers; [ abbradar nocent ];