Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae6bdcc53584
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b96cdee09771
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 20, 2020

  1. Copy the full SHA
    f028498 View commit details

Commits on Mar 28, 2020

  1. Merge pull request #82998 from OPNA2608/update-rpcs3

    rpcs3: 0.0.6-8187-790962425 -> 0.0.8-9300-341fdf7eb
    bhipple authored Mar 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b96cdee View commit details
Showing with 9 additions and 9 deletions.
  1. +9 −9 pkgs/misc/emulators/rpcs3/default.nix
18 changes: 9 additions & 9 deletions pkgs/misc/emulators/rpcs3/default.nix
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 = ''
@@ -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 ];