From 8f64917951c2c87d8b19165f1b7e553378f3c7ea Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Fri, 18 Jul 2025 18:39:03 -0400 Subject: [PATCH] obs-studio-plugins.obs-vertical canvas: fix build Fix a build failure introduced by -Werror=attribute-warning in CFLAGS --- .../obs-studio/plugins/obs-vertical-canvas.diff | 17 +++++++++++++++++ .../obs-studio/plugins/obs-vertical-canvas.nix | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff new file mode 100644 index 000000000000..b4b2fa22aa0d --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff @@ -0,0 +1,17 @@ +diff --color -urpN obs-vertical-canvas.bak/file-updater.c obs-vertical-canvas/file-updater.c +--- obs-vertical-canvas.bak/file-updater.c 2025-07-18 18:32:13.239718611 -0400 ++++ obs-vertical-canvas/file-updater.c 2025-07-18 18:32:30.732020377 -0400 +@@ -67,10 +67,10 @@ static bool do_http_request(struct updat + curl_easy_setopt(info->curl, CURLOPT_ERRORBUFFER, info->error); + curl_easy_setopt(info->curl, CURLOPT_WRITEFUNCTION, http_write); + curl_easy_setopt(info->curl, CURLOPT_WRITEDATA, info); +- curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, true); +- curl_easy_setopt(info->curl, CURLOPT_NOSIGNAL, 1); ++ curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, 1L); ++ curl_easy_setopt(info->curl, CURLOPT_NOSIGNAL, 1L); + curl_easy_setopt(info->curl, CURLOPT_ACCEPT_ENCODING, ""); +- curl_easy_setopt(info->curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_REVOKE_BEST_EFFORT); ++ curl_easy_setopt(info->curl, CURLOPT_SSL_OPTIONS, (long)CURLSSLOPT_REVOKE_BEST_EFFORT); + + code = curl_easy_perform(info->curl); + if (code != CURLE_OK) { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 41f1b34f6daf..2dd87819c346 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-0XfJ8q8n2ANO0oDtLZhZjRunZ5S1EouQ6Ak/pxEQYOQ="; }; + # Remove after https://github.com/Aitum/obs-vertical-canvas/pull/25 is released :) + patches = [ ./obs-vertical-canvas.diff ]; + nativeBuildInputs = [ cmake ]; buildInputs = [