Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.03] rpcs3: 0.0.6-8187-790962425 -> 0.0.8-9300-341fdf7eb #83563

Merged
merged 1 commit into from
Mar 28, 2020
Merged

[20.03] rpcs3: 0.0.6-8187-790962425 -> 0.0.8-9300-341fdf7eb #83563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions pkgs/misc/emulators/rpcs3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = ''
Expand All @@ -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 ];
Expand Down