diff options
author | Artturi <Artturin@artturin.com> | 2022-11-04 20:31:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-04 20:31:39 +0200 |
commit | 9d556e2c7568cd2b84446618f635f8b3bcc19a2f (patch) | |
tree | 1a4cc0fd0cd4b11aa01f5b8b8e9131daf520d146 /pkgs | |
parent | 1cdecacb7918fbcebfa41ae6597dc166a3a8a097 (diff) | |
parent | a34fb665ea4d61bee2596c7e34490b0f4d011ce4 (diff) |
Merge pull request #198198 from Artturin/fixevalofstudio
obs-studio-plugins.obs-hyperion: fix Function called without required…
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/obs-studio/plugins/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix | 27 |
2 files changed, 22 insertions, 7 deletions
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index b9be0a2b6eb1e..02ce844c07605 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 { }; 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 a358249080709..90fffa50ed592 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" ]; |