From a64e65b58661b9924e9e846f30e317f14415deb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Mar 2025 14:21:36 +0000 Subject: [PATCH 1/3] obs-studio: 31.0.1 -> 31.0.2 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 776418762f71..be1933e5471e 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "31.0.1"; + version = "31.0.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-dwS/90j4WfcneAsGFwuABM7xqvq1+VSD2uDVdU/GgQo="; + hash = "sha256-I8VExGFr0thEaT8vHvdNwck7AYSpdpfLVPjij1Utt0E="; fetchSubmodules = true; }; From 4b64906ce933cf038dd62ea2eb1112cda76a78cd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 8 Mar 2025 21:51:40 +0100 Subject: [PATCH 2/3] obs-studio-plugins.obs-hyperion: fix build --- .../video/obs-studio/plugins/obs-hyperion/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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 d7cb122e8354..ee34343c275f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + preConfigure = '' rm -rf external/flatbuffers ''; From 0eb6a300f0b713cd512654118fca746a86209cb0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 8 Mar 2025 21:55:27 +0100 Subject: [PATCH 3/3] obs-studio-plugins: mark some plugins as broken --- .../video/obs-studio/plugins/droidcam-obs/default.nix | 1 + pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix | 1 + pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index c6f704d08d76..9497f8451854 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ulrikstrid ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix index 10156ce3af6c..97747cadbab0 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hlad ]; + broken = true; }; }) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix index cd3b410096cf..f1120c7c255e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ babbaj ]; platforms = [ "x86_64-linux" ]; + broken = true; }; }