Skip to content

rpcs3: 0.0.4-8032 -> 0.0.5-6980 #41414

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

Merged
xeji merged 5 commits into from
Jun 25, 2018
Merged

rpcs3: 0.0.4-8032 -> 0.0.5-6980 #41414

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8471a1e
rpcs3: 0.0.4-8032 -> 0.0.5-6884
ilian Jun 3, 2018
6beac41
rpcs3: update hash
ilian Jun 3, 2018
e0100ff
rpcs3: 0.0.5-6884 -> 0.0.5-6925
ilian Jun 9, 2018
f59e374
rpcs3: 0.0.5-6925 -> 0.0.5-6938
ilian Jun 12, 2018
fa573c9
rpcs3: 0.0.5-6938 -> 0.0.5-6980
ilian Jun 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions pkgs/misc/emulators/rpcs3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,42 @@
{ stdenv, lib, fetchgit, cmake, pkgconfig
, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev
, pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib
}:

stdenv.mkDerivation rec {
name = "rpcs3-${version}";
version = "2018-02-23";

src = fetchgit {
url = "https://github.com/RPCS3/rpcs3";
rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb";
sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x";
};
{ stdenv, lib, fetchgit, cmake, pkgconfig, git
, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27
, pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib
}:

let
majorVersion = "0.0.5";
gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in
stdenv.mkDerivation rec {
name = "rpcs3-${version}";
version = "${majorVersion}-${gitVersion}";

src = fetchgit {
url = "https://github.com/RPCS3/rpcs3";
rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8";
sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0";
};

preConfigure = ''
cat > ./rpcs3/git-version.h <<EOF
#define RPCS3_GIT_VERSION "${gitVersion}"
#define RPCS3_GIT_BRANCH "HEAD"
#define RPCS3_GIT_VERSION_NO_UPDATE 1
EOF
'';

cmakeFlags = [
"-DUSE_SYSTEM_LIBPNG=ON"
"-DUSE_SYSTEM_FFMPEG=ON"
"-DUSE_NATIVE_INSTRUCTIONS=OFF"
];

nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig git ];

buildInputs = [
qtbase openal glew llvm_4 vulkan-loader libpng ffmpeg libevdev
qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27
] ++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland;
Expand All @@ -34,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "PS3 emulator/debugger";
homepage = "https://rpcs3.net/";
maintainers = with maintainers; [ abbradar ];
maintainers = with maintainers; [ abbradar nocent ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" ];
};
Expand Down