From de2a3601a047c232fd88f2a64fd7e2b12680cc80 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 28 Oct 2022 06:31:44 +0300 Subject: [PATCH 1/2] obs-studio-plugins.obs-hyperion: fix Function called without required argument "qtbase" --- pkgs/applications/video/obs-studio/plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index b9be0a2b6eb1..02ce844c0760 100644 --- 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 { }; From a34fb665ea4d61bee2596c7e34490b0f4d011ce4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 28 Oct 2022 06:41:44 +0300 Subject: [PATCH 2/2] obs-studio-plugins.obs-hyperion: fix src and switch to cmake --- .../plugins/obs-hyperion/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix index a35824908070..90fffa50ed59 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -1,22 +1,37 @@ -{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config, obs-studio, libGL -, qtbase }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, obs-studio, libGL +, qtbase, flatbuffers }: 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 ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ obs-studio libGL qtbase ]; + dontWrapQtApps = true; + + cmakeFlags = [ + "-DOBS_SOURCE=${obs-studio.src}" + "-DGLOBAL_INSTALLATION=ON" + ]; + + preConfigure = '' + # https://github.com/hyperion-project/hyperion-obs-plugin/issues/7 + rm -rf external/flatbuffers + cp -r ${flatbuffers.src} external/flatbuffers + chmod -R a+w external + ''; + meta = with lib; { description = "OBS Studio plugin to connect to a Hyperion.ng server"; + homepage = "https://github.com/hyperion-project/hyperion-obs-plugin"; license = licenses.mit; maintainers = with maintainers; [ algram ]; platforms = [ "x86_64-linux" ];