diff options
Diffstat (limited to 'pkgs/misc/emulators/rpcs3')
-rw-r--r-- | pkgs/misc/emulators/rpcs3/default.nix | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index f71420674e5..bf1dc1c9573 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,55 +1,63 @@ -{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng -, ffmpeg, libevdev, python3 +, ffmpeg, libevdev, libusb1, zlib, curl, python3 +, sdl2Support ? true, SDL2 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib +, alsaSupport ? true, alsa-lib }: let - majorVersion = "0.0.8"; - gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) + majorVersion = "0.0.16"; + gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "v${majorVersion}"; - sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; + src = fetchFromGitHub { + owner = "RPCS3"; + repo = "rpcs3"; + rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c"; + fetchSubmodules = true; + sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd"; }; preConfigure = '' cat > ./rpcs3/git-version.h <<EOF #define RPCS3_GIT_VERSION "${gitVersion}" + #define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master" #define RPCS3_GIT_BRANCH "HEAD" #define RPCS3_GIT_VERSION_NO_UPDATE 1 EOF ''; cmakeFlags = [ + "-DUSE_SYSTEM_ZLIB=ON" + "-DUSE_SYSTEM_LIBUSB=ON" "-DUSE_SYSTEM_LIBPNG=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" ]; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev python3 - ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional alsaSupport alsaLib + libevdev zlib libusb1 curl python3 + ] ++ lib.optional sdl2Support SDL2 + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional alsaSupport alsa-lib ++ lib.optional waylandSupport wayland; - enableParallelBuilding = true; - meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar nocent ]; - license = licenses.gpl2; + maintainers = with maintainers; [ abbradar neonfuz ilian ]; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; } |