Merge master into staging-next
This commit is contained in:
commit
1f27250952
1 changed files with 5 additions and 4 deletions
|
@ -7,8 +7,8 @@
|
|||
}:
|
||||
|
||||
let
|
||||
majorVersion = "0.0.8";
|
||||
gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
|
||||
majorVersion = "0.0.12";
|
||||
gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
|
||||
in
|
||||
mkDerivation {
|
||||
pname = "rpcs3";
|
||||
|
@ -17,12 +17,13 @@ mkDerivation {
|
|||
src = fetchgit {
|
||||
url = "https://github.com/RPCS3/rpcs3";
|
||||
rev = "v${majorVersion}";
|
||||
sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1";
|
||||
sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x";
|
||||
};
|
||||
|
||||
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
|
||||
|
@ -48,7 +49,7 @@ mkDerivation {
|
|||
meta = with lib; {
|
||||
description = "PS3 emulator/debugger";
|
||||
homepage = "https://rpcs3.net/";
|
||||
maintainers = with maintainers; [ abbradar nocent ];
|
||||
maintainers = with maintainers; [ abbradar neonfuz nocent ];
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue