Merge staging-next into staging

pkgs/misc/emulators/rpcs3/default.nix

@@ -1,23 +1,26 @@
-{ mkDerivation, lib, fetchgit, cmake, pkg-config, git
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git
 , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng
-, ffmpeg, libevdev, python3
+, ffmpeg, libevdev, libusb1, zlib, curl, python3
+, sdl2Support ? true, SDL2
 , pulseaudioSupport ? true, libpulseaudio
 , waylandSupport ? true, wayland
 , alsaSupport ? true, alsaLib
 }:
 
 let
-  majorVersion = "0.0.12";
-  gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
+  majorVersion = "0.0.16";
+  gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
 in
 mkDerivation {
   pname = "rpcs3";
   version = "${majorVersion}-${gitVersion}";
 
-  src = fetchgit {
-    url = "https://github.com/RPCS3/rpcs3";
-    rev = "v${majorVersion}";
-    sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x";
+  src = fetchFromGitHub {
+    owner = "RPCS3";
+    repo = "rpcs3";
+    rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c";
+    fetchSubmodules = true;
+    sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd";
   };
 
   preConfigure = ''
@@ -30,8 +33,13 @@ mkDerivation {
   '';
 
   cmakeFlags = [
+    "-DUSE_SYSTEM_ZLIB=ON"
+    "-DUSE_SYSTEM_LIBUSB=ON"
     "-DUSE_SYSTEM_LIBPNG=ON"
     "-DUSE_SYSTEM_FFMPEG=ON"
+    "-DUSE_SYSTEM_CURL=ON"
+    # NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake
+    #"-DUSE_SYSTEM_WOLFSSL=ON"
     "-DUSE_NATIVE_INSTRUCTIONS=OFF"
   ];
 
@@ -39,8 +47,9 @@ mkDerivation {
 
   buildInputs = [
     qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg
-    libevdev python3
-  ] ++ lib.optional pulseaudioSupport libpulseaudio
+    libevdev zlib libusb1 curl python3
+  ] ++ lib.optional sdl2Support SDL2
+    ++ lib.optional pulseaudioSupport libpulseaudio
     ++ lib.optional alsaSupport alsaLib
     ++ lib.optional waylandSupport wayland;
 
@@ -48,7 +57,7 @@ mkDerivation {
     description = "PS3 emulator/debugger";
     homepage = "https://rpcs3.net/";
     maintainers = with maintainers; [ abbradar neonfuz ilian ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
     platforms = [ "x86_64-linux" ];
   };
 }

pkgs/misc/vscode-extensions/wakatime/default.nix

@@ -13,8 +13,8 @@ in
     };
 
     postPatch = ''
-      mkdir -p wakatime-master
-      cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime
+      mkdir wakatime-cli
+      ln -s ${wakatime}/bin/wakatime ./wakatime-cli/wakatime-cli
     '';
 
     meta = with lib; {