BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #122140 from vs49688/rpcs3

Browse source 
rpcs3: 0.0.12 -> 0.0.16
This commit is contained in:
Anderson Torres 2021-05-14 00:19:10 -03:00 committed by GitHub
commit 5d4a430472
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/misc/emulators/rpcs3/default.nix
View file

@ -1,23 +1,26 @@
{ mkDerivation, lib, fetchgit, cmake, pkg-config, git { mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git
, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng
, ffmpeg, libevdev, python3 , ffmpeg, libevdev, libusb1, zlib, curl, python3
, sdl2Support ? true, SDL2
, pulseaudioSupport ? true, libpulseaudio , pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland , waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib , alsaSupport ? true, alsaLib
}: }:
let let
majorVersion = "0.0.12"; majorVersion = "0.0.16";
gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in in
mkDerivation { mkDerivation {
pname = "rpcs3"; pname = "rpcs3";
version = "${majorVersion}-${gitVersion}"; version = "${majorVersion}-${gitVersion}";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/RPCS3/rpcs3"; owner = "RPCS3";
rev = "v${majorVersion}"; repo = "rpcs3";
sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x"; rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c";
fetchSubmodules = true;
sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd";
}; };
preConfigure = '' preConfigure = ''
@ -30,8 +33,13 @@ mkDerivation {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DUSE_SYSTEM_ZLIB=ON"
"-DUSE_SYSTEM_LIBUSB=ON"
"-DUSE_SYSTEM_LIBPNG=ON" "-DUSE_SYSTEM_LIBPNG=ON"
"-DUSE_SYSTEM_FFMPEG=ON" "-DUSE_SYSTEM_FFMPEG=ON"
"-DUSE_SYSTEM_CURL=ON"
# NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake
#"-DUSE_SYSTEM_WOLFSSL=ON"
"-DUSE_NATIVE_INSTRUCTIONS=OFF" "-DUSE_NATIVE_INSTRUCTIONS=OFF"
]; ];
@ -39,8 +47,9 @@ mkDerivation {
buildInputs = [ buildInputs = [
qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg
libevdev python3 libevdev zlib libusb1 curl python3
] ++ lib.optional pulseaudioSupport libpulseaudio ] ++ lib.optional sdl2Support SDL2
++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib ++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland; ++ lib.optional waylandSupport wayland;
@ -48,7 +57,7 @@ mkDerivation {
description = "PS3 emulator/debugger"; description = "PS3 emulator/debugger";
homepage = "https://rpcs3.net/"; homepage = "https://rpcs3.net/";
maintainers = with maintainers; [ abbradar neonfuz ilian ]; maintainers = with maintainers; [ abbradar neonfuz ilian ];
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View file

@ -25961,7 +25961,7 @@ in
rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; rootlesskit = callPackage ../tools/virtualization/rootlesskit {};
rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
rsclock = callPackage ../applications/misc/rsclock { }; rsclock = callPackage ../applications/misc/rsclock { };