JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-13 06:17:53 +00:00 committed by GitHub
commit 1f27250952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/misc/emulators/rpcs3/default.nix
View File

@ -7,8 +7,8 @@
}: }:
let let
majorVersion = "0.0.8"; majorVersion = "0.0.12";
gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in in
mkDerivation { mkDerivation {
pname = "rpcs3"; pname = "rpcs3";
@ -17,12 +17,13 @@ mkDerivation {
src = fetchgit { src = fetchgit {
url = "https://github.com/RPCS3/rpcs3"; url = "https://github.com/RPCS3/rpcs3";
rev = "v${majorVersion}"; rev = "v${majorVersion}";
sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x";
}; };
preConfigure = '' preConfigure = ''
cat > ./rpcs3/git-version.h <<EOF cat > ./rpcs3/git-version.h <<EOF
#define RPCS3_GIT_VERSION "${gitVersion}" #define RPCS3_GIT_VERSION "${gitVersion}"
#define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master"
#define RPCS3_GIT_BRANCH "HEAD" #define RPCS3_GIT_BRANCH "HEAD"
#define RPCS3_GIT_VERSION_NO_UPDATE 1 #define RPCS3_GIT_VERSION_NO_UPDATE 1
EOF EOF
@ -48,7 +49,7 @@ mkDerivation {
meta = with lib; { meta = with lib; {
description = "PS3 emulator/debugger"; description = "PS3 emulator/debugger";
homepage = "https://rpcs3.net/"; homepage = "https://rpcs3.net/";
maintainers = with maintainers; [ abbradar nocent ]; maintainers = with maintainers; [ abbradar neonfuz nocent ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };