obs-hyperion: fix qtbase call

NixOS · Sep 10, 2022 · 1fd82a3 · 1fd82a3
1 parent 6db6585
commit 1fd82a3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -12,7 +12,7 @@
 
   obs-gstreamer = callPackage ./obs-gstreamer.nix { };
 
-  obs-hyperion = callPackage ./obs-hyperion/default.nix { };
+  obs-hyperion = libsForQt5.callPackage ./obs-hyperion/default.nix { };
 
   obs-move-transition = callPackage ./obs-move-transition.nix { };
 

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config, obs-studio, libGL
-, qtbase }:
+{ stdenv, lib, fetchFromGitHub, cmake, flatbuffers, git, obs-studio, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "obs-hyperion";
   version = "1.0.1";
 
-  src = fetchFromGitLab {
+  src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = "hyperion-obs-plugin";
-    rev = "v${version}";
-    sha256 = "sha256-Si+TGYWpNPtUUFT+M571lCYslPyeYX92MdYV2EGgcyQ=";
+    rev = version;
+    sha256 = "sha256-pfWfJWuIoa+74u5J76/GE+OuHkksbwOAPfsR9OGX3L4=";
   };
 
-  nativeBuildInputs = [ meson pkg-config ninja ];
-  buildInputs = [ obs-studio libGL qtbase ];
+  nativeBuildInputs = [ cmake flatbuffers git ];
+  buildInputs = [ obs-studio qtbase flatbuffers git ];
+
+  cmakeFlags = [
+    "-DOBS_SOURCE=${obs-studio.src}"
+    "-DFLATBUFFERS_FLATC_EXECUTABLE=${flatbuffers}/bin/flatc"
+    "-DGLOBAL_INSTALLATION=ON"
+  ];
+
+  dontWrapQtApps = true;
 
   meta = with lib; {
     description = "OBS Studio plugin to connect to a Hyperion.ng server";