about summary refs log tree commit diff
path: root/pkgs/applications/video/obs-studio
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-11-30 03:27:20 +0100
committerGitHub <noreply@github.com>2023-11-30 03:27:20 +0100
commit598257e86895b2d7f3df7934dee0d3e663421517 (patch)
tree606d8aaaecf6bf63035777c4e0a419600b843503 /pkgs/applications/video/obs-studio
parent27ed44cff1bdcd640f6e18e5f1ac8f8ec646fc4f (diff)
parent56bdc24fadfe0ec24e6384eeb8d306ae0a93ccf4 (diff)
downloadnixlib-598257e86895b2d7f3df7934dee0d3e663421517.tar
nixlib-598257e86895b2d7f3df7934dee0d3e663421517.tar.gz
nixlib-598257e86895b2d7f3df7934dee0d3e663421517.tar.bz2
nixlib-598257e86895b2d7f3df7934dee0d3e663421517.tar.lz
nixlib-598257e86895b2d7f3df7934dee0d3e663421517.tar.xz
nixlib-598257e86895b2d7f3df7934dee0d3e663421517.tar.zst
nixlib-598257e86895b2d7f3df7934dee0d3e663421517.zip
Merge pull request #270447 from paveloom/advanced-scene-switcher
obs-studio-plugins.advanced-scene-switcher: 1.23.1 -> 1.24.0 + refactor
Diffstat (limited to 'pkgs/applications/video/obs-studio')
-rw-r--r--pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix38
1 files changed, 26 insertions, 12 deletions
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index 2790cf19f58e..aee37b4b06d1 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -1,41 +1,53 @@
-{ alsa-lib
-, asio
+{ lib
+, fetchFromGitHub
+
 , cmake
+, ninja
+
+, alsa-lib
+, asio
 , curl
-, fetchFromGitHub
-, lib
-, libremidi
+, nlohmann_json
 , obs-studio
 , opencv
 , procps
 , qtbase
 , stdenv
+, tesseract
 , websocketpp
 , xorg
+
+, httplib
+, libremidi
 }:
 
 stdenv.mkDerivation rec {
   pname = "advanced-scene-switcher";
-  version = "1.23.1";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
     rev = version;
-    hash = "sha256-rpZ/vR9QbWgr8n6LDv6iTRsKXSIDGy0IpPu1Uatb0zw=";
+    hash = "sha256-Xnf8Vz6I5EfiiVoG0JRd0f0IJHw1IVkTLL4Th/hWYrc=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
 
   buildInputs = [
     alsa-lib
     asio
     curl
     libremidi
+    nlohmann_json
     obs-studio
     opencv
     procps
     qtbase
+    tesseract
     websocketpp
     xorg.libXScrnSaver
   ];
@@ -43,7 +55,9 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   postUnpack = ''
+    cp -r ${httplib.src}/* $sourceRoot/deps/cpp-httplib
     cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi
+    chmod -R +w $sourceRoot/deps/cpp-httplib
     chmod -R +w $sourceRoot/deps/libremidi
   '';
 
@@ -53,11 +67,11 @@ stdenv.mkDerivation rec {
     mv $out/data $out/share/obs
   '';
 
-  meta = {
+  meta = with lib; {
     description = "An automated scene switcher for OBS Studio";
     homepage = "https://github.com/WarmUpTill/SceneSwitcher";
-    maintainers = with lib.maintainers; [ paveloom ];
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ paveloom ];
   };
 }