mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
nocent 2018-06-25 09:45:51 +00:00 committed by xeji
parent abb2286016
commit f8530c887b
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,19 +1,31 @@
{ stdenv, lib, fetchgit, cmake, pkgconfig { stdenv, lib, fetchgit, cmake, pkgconfig, git
, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev , qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27
, pulseaudioSupport ? true, libpulseaudio , pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland , waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib , alsaSupport ? true, alsaLib
}: }:
stdenv.mkDerivation rec { let
name = "rpcs3-${version}"; majorVersion = "0.0.5";
version = "2018-02-23"; gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in
src = fetchgit { stdenv.mkDerivation rec {
url = "https://github.com/RPCS3/rpcs3"; name = "rpcs3-${version}";
rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb"; version = "${majorVersion}-${gitVersion}";
sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x";
}; 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 = [ cmakeFlags = [
"-DUSE_SYSTEM_LIBPNG=ON" "-DUSE_SYSTEM_LIBPNG=ON"
@ -21,10 +33,10 @@ stdenv.mkDerivation rec {
"-DUSE_NATIVE_INSTRUCTIONS=OFF" "-DUSE_NATIVE_INSTRUCTIONS=OFF"
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = [ 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 pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib ++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland; ++ lib.optional waylandSupport wayland;
@ -34,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "PS3 emulator/debugger"; description = "PS3 emulator/debugger";
homepage = "https://rpcs3.net/"; homepage = "https://rpcs3.net/";
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar nocent ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };