JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #198198 from Artturin/fixevalofstudio

Browse Source 
obs-studio-plugins.obs-hyperion: fix Function called without required…
This commit is contained in:
Artturi 2022-11-04 20:31:39 +02:00 committed by GitHub
commit 9d556e2c75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/obs-studio/plugins/default.nix
View File

@ -12,7 +12,7 @@
obs-gstreamer = callPackage ./obs-gstreamer.nix { }; 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 { }; obs-move-transition = callPackage ./obs-move-transition.nix { };

27
pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
View File

@ -1,22 +1,37 @@
{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config, obs-studio, libGL { stdenv, lib, fetchFromGitHub, cmake, pkg-config, obs-studio, libGL
, qtbase }: , qtbase, flatbuffers }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "obs-hyperion"; pname = "obs-hyperion";
version = "1.0.1"; version = "1.0.1";
src = fetchFromGitLab { src = fetchFromGitHub {
owner = "hyperion-project"; owner = "hyperion-project";
repo = "hyperion-obs-plugin"; repo = "hyperion-obs-plugin";
rev = "v${version}"; rev = version;
sha256 = "sha256-Si+TGYWpNPtUUFT+M571lCYslPyeYX92MdYV2EGgcyQ="; sha256 = "sha256-pfWfJWuIoa+74u5J76/GE+OuHkksbwOAPfsR9OGX3L4=";
}; };
nativeBuildInputs = [ meson pkg-config ninja ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ obs-studio libGL qtbase ]; 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; { meta = with lib; {
description = "OBS Studio plugin to connect to a Hyperion.ng server"; description = "OBS Studio plugin to connect to a Hyperion.ng server";
homepage = "https://github.com/hyperion-project/hyperion-obs-plugin";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ algram ]; maintainers = with maintainers; [ algram ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];