push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/src/HyperionProperties.cpp b/src/HyperionProperties.cpp
index b585702..3fd308c 100644
--- a/src/HyperionProperties.cpp
+++ b/src/HyperionProperties.cpp
@@ -59,7 +59,7 @@ HyperionProperties::HyperionProperties(QWidget *parent)
signal_handler_connect(handler, "log", logger_message, this);
connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::saveSettings);
- connect(ui->AutoStart, &QCheckBox::stateChanged, this, &HyperionProperties::saveSettings);
+ connect(ui->AutoStart, &QCheckBox::checkStateChanged, this, &HyperionProperties::saveSettings);
connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::onStart);
connect(ui->ButtonStop, &QPushButton::clicked, this, &HyperionProperties::onStop);

View File

@@ -0,0 +1,59 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
pkg-config,
obs-studio,
libGL,
qtbase,
flatbuffers,
}:
stdenv.mkDerivation rec {
pname = "obs-hyperion";
version = "1.0.2";
src = fetchFromGitHub {
owner = "hyperion-project";
repo = "hyperion-obs-plugin";
rev = version;
sha256 = "sha256-UAfjafoZhhhHRSo+eUBLhHaCmn2GYFcYyRb9wHIp/9I=";
};
nativeBuildInputs = [
cmake
flatbuffers
pkg-config
];
buildInputs = [
obs-studio
flatbuffers
libGL
qtbase
];
dontWrapQtApps = true;
patches = [ ./check-state-changed.patch ];
cmakeFlags = [
"-DOBS_SOURCE=${obs-studio.src}"
"-DGLOBAL_INSTALLATION=ON"
"-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON"
];
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
preConfigure = ''
rm -rf external/flatbuffers
'';
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 ];
inherit (obs-studio.meta) platforms;
};
}