obs-studio-plugins.obs-multi-rtmp: 0.2.8.1 -> 0.2.8.1-OBS28

raphaelr · Oct 14, 2022 · 69302bd · 69302bd
1 parent 5dc7596
commit 69302bd
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 9 deletions.
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -1,4 +1,7 @@
-{ callPackage, libsForQt5, pkgsi686Linux }:
+{ callPackage
+, qt6Packages
+, pkgsi686Linux
+}:
 
 # When adding new plugins:
 # - Respect alphabetical order. On diversion, file a PR.
@@ -16,9 +19,9 @@
 
   obs-move-transition = callPackage ./obs-move-transition.nix { };
 
-  obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix { };
+  obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { };
 
-  obs-ndi = libsForQt5.callPackage ./obs-ndi.nix { };
+  obs-ndi = qt6Packages.callPackage ./obs-ndi.nix { };
 
   obs-nvfbc = callPackage ./obs-nvfbc.nix { };
 

diff --git a/...deo/obs-studio/plugins/obs-multi-rtmp.nix → ...studio/plugins/obs-multi-rtmp/default.nix b/...deo/obs-studio/plugins/obs-multi-rtmp.nix → ...studio/plugins/obs-multi-rtmp/default.nix
@@ -2,22 +2,23 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-multi-rtmp";
-  version = "0.2.8.1";
+  version = "0.2.8.1-OBS28";
 
   src = fetchFromGitHub {
     owner = "sorayuki";
     repo = "obs-multi-rtmp";
     rev = version;
-    sha256 = "sha256-OhatuSlDJ2VDNorM4QfoKPYKyv5YpN8EnIelLdBTlZ0=";
+    hash = "sha256-1W+c8Y0AmtKQmCIg8IDAaYYStQzDpZRuqw3vZEY5ncU=";
   };
 
+  patches = [
+  # Patch cmake file to link against the obs build output, instead of its sources
+    ./fix-build.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ obs-studio qtbase ];
 
-  cmakeFlags = [
-    "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs"
-  ];
-
   dontWrapQtApps = true;
 
   meta = with lib; {

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch
@@ -0,0 +1,55 @@
+From 72aeddb52c2b656bfec918097ad07a0ff092008b Mon Sep 17 00:00:00 2001
+From: Raphael Robatsch <raphael-git@tapesoftware.net>
+Date: Thu, 13 Oct 2022 21:34:21 +0200
+Subject: [PATCH] Link against OBS public interface instead of sources
+
+---
+ CMakeLists.txt | 22 ++++------------------
+ 1 file changed, 4 insertions(+), 18 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27e20f8..8725c5b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,15 +65,9 @@ if (WIN32)
+         "/def:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.def"
+         "/out:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.lib"
+     )
+-elseif (APPLE)
+-    # macOS
+-    find_library(_LIB_OBS "${LIB_OBS}.0.dylib" PATHS ${OBS_BIN_DIR} REQUIRED)
+-    set(LIB_OBS "${_LIB_OBS}")
+-elseif (UNIX)
+-    # Linux
+-    find_package(LibObs REQUIRED)
+ else ()
+-    message(FATAL_ERROR "Unsupported OS!")
++    find_package(libobs REQUIRED)
++    find_package(obs-frontend-api REQUIRED)
+ endif ()
+
+
+@@ -96,18 +90,10 @@ if (WIN32)
+         "${CMAKE_CURRENT_BINARY_DIR}/version.rc"
+     )
+ endif ()
+-target_include_directories(obs-multi-rtmp PRIVATE
+-    "${OBS_SRC_DIR}/libobs"
+-    "${OBS_SRC_DIR}/UI/obs-frontend-api"
+-)
+-target_link_directories(obs-multi-rtmp PRIVATE
+-    "${CMAKE_CURRENT_BINARY_DIR}"
+-    ${OBS_BIN_DIR}
+-)
+ target_link_libraries(obs-multi-rtmp PRIVATE
+     Qt6::Widgets
+-    ${LIB_OBS}
+-    obs-frontend-api
++    OBS::libobs
++    OBS::obs-frontend-api
+ )
+
+ if (WIN32)
+-- 
+2.37.3
+