From f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d Mon Sep 17 00:00:00 2001
From: nocent <nocent@protonmail.ch>
Date: Mon, 25 Jun 2018 09:45:51 +0000
Subject: 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.
---
 pkgs/misc/emulators/rpcs3/default.nix | 50 ++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 19 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index 140149bde495..732a5971ed3c 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" ];
   };
-- 
cgit 1.4.1