diff options
author | nocent <nocent@protonmail.ch> | 2018-06-25 09:45:51 +0000 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-25 11:45:50 +0200 |
commit | f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d (patch) | |
tree | 3c1bf28d73c8e5bdd7a9a056c57f5aa9b0e7fcfb /pkgs/misc/emulators | |
parent | abb22860169f9afe165174d397ff217278c71f5e (diff) | |
download | nixpkgs-f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d.tar nixpkgs-f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d.tar.gz nixpkgs-f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d.tar.bz2 nixpkgs-f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d.tar.lz nixpkgs-f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d.tar.xz nixpkgs-f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d.tar.zst nixpkgs-f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d.zip |
rpcs3: 0.0.4-8032 -> 0.0.5-6980 (#41414)
* rpcs3: 0.0.4-8032 -> 0.0.5-6884 * rpcs3: update hash * rpcs3: 0.0.5-6884 -> 0.0.5-6925 * rpcs3: 0.0.5-6925 -> 0.0.5-6938 * rpcs3: 0.0.5-6938 -> 0.0.5-6980 Manually write version header instead of generating it with git, which required leaveDotGit to be enabled. This caused some hash mismatches (see #8567) has thus been disabled.
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/rpcs3/default.nix | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 140149bde49..732a5971ed3 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,19 +1,31 @@ -{ 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" @@ -21,10 +33,10 @@ stdenv.mkDerivation rec { "-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; @@ -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" ]; }; |