Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'

4 files changed, 44 insertions, 37 deletions

diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix
index 1845757fb308..b0d422385424 100644
--- a/nixpkgs/pkgs/misc/emulators/citra/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix
@@ -2,19 +2,18 @@
 
 stdenv.mkDerivation rec { 
   name = "citra-${version}";
-  version = "2018-06-09";
+  version = "2019-05-25";
 
   # Submodules
   src = fetchgit {
     url = "https://github.com/citra-emu/citra";
-    rev = "cf9bfe0690f1934847500cc5079b1aaf3299a507";
-    sha256 = "1ryc5d3fnhzlrzh1yljbq9x5n79dsb5hgqdba8z4x56iccx0kd0p";
+    rev = "186ffc235f744dad315a603a98cce4597ef0f65f";
+    sha256 = "0w24an80yjmkfcxjzdvsbpahx46bmd90liq5m6qva5pgnpmxx7pn";
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ SDL2 qtbase qtmultimedia boost curl gtest ];
-  cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ];
+  buildInputs = [ SDL2 qtbase qtmultimedia boost ];
 
   preConfigure = ''
     # Trick configure system.
diff --git a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
index 732a5971ed3c..4c44377c11e6 100644
--- a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
@@ -1,29 +1,29 @@
-{ 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                                                                           
+{ 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.6";
+  gitVersion = "8187-790962425"; # 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 = "790962425cfb893529f72b3ef0dd1424fcc42973";
+    sha256 = "154ys29b9xdws3bp4b7rb3kc0h9hd49g2yf3z9268cdq8aclahaa";
+  };
+
+  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
   '';
 
diff --git a/nixpkgs/pkgs/misc/emulators/uae/default.nix b/nixpkgs/pkgs/misc/emulators/uae/default.nix
index 318993d08b66..313b61b393e4 100644
--- a/nixpkgs/pkgs/misc/emulators/uae/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/uae/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk2 alsaLib SDL ];
 
   hardeningDisable = [ "format" ];
+  LDFLAGS = [ "-lm" ];
 
   meta = {
     description = "Ultimate/Unix/Unusable Amiga Emulator";
diff --git a/nixpkgs/pkgs/misc/emulators/xcpc/default.nix b/nixpkgs/pkgs/misc/emulators/xcpc/default.nix
index 5eb6e3b160ef..3806d25e5d00 100644
--- a/nixpkgs/pkgs/misc/emulators/xcpc/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/xcpc/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, libdsk, pkgconfig, glib, libXaw, libX11, libXext, lesstif }:
+{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext
+  , libDSKSupport ? true, libdsk
+  , motifSupport ? false, lesstif
+}:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   version = "20070122";
-  name = "xcpc-${version}";
+  pname = "xcpc";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xcpc/${name}.tar.gz";
+    url = "mirror://sourceforge/xcpc/${pname}-${version}.tar.gz";
     sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib libdsk libXaw libX11 libXext lesstif ];
 
-  meta = with stdenv.lib; {
+  buildInputs = [ glib libdsk libXaw libX11 libXext ]
+    ++ optional libDSKSupport libdsk
+    ++ optional motifSupport lesstif;
+
+  meta = {
     description = "A portable Amstrad CPC 464/664/6128 emulator written in C";
-    homepage = https://www.xcpc-emulator.net;
+    homepage = "https://www.xcpc-emulator.net";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.genesis ];
     platforms = platforms.linux;