From 389a26de52ac502acc35e542ff31acebe9bb4298 Mon Sep 17 00:00:00 2001 From: FizzyApple12 Date: Fri, 4 Jul 2025 16:40:23 -0400 Subject: [PATCH] distroav: 6.0.0 -> 6.1.1 https://github.com/DistroAV/DistroAV/releases/tag/6.1.1 --- .../video/obs-studio/plugins/distroav/default.nix | 4 ++-- .../obs-studio/plugins/distroav/hardcode-ndi-path.patch | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix index 6654cb08ac40..f24a89c61bc3 100644 --- a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "distroav"; - version = "6.0.0"; + version = "6.1.1"; nativeBuildInputs = [ cmake @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "DistroAV"; repo = "DistroAV"; tag = version; - hash = "sha256-pr/5XCLo5fzergIQrYFC9o9K+KuP4leDk5/oRe5ct9Q="; + hash = "sha256-nbXh6bjpiKbvuntZSnuTWWpmhfAcep7Krjjq8FvbENk="; }; # Modify plugin-main.cpp file to fix ndi libs path diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/plugins/distroav/hardcode-ndi-path.patch index 567d5c4fbcb7..57ee66bff56e 100644 --- a/pkgs/applications/video/obs-studio/plugins/distroav/hardcode-ndi-path.patch +++ b/pkgs/applications/video/obs-studio/plugins/distroav/hardcode-ndi-path.patch @@ -1,8 +1,8 @@ diff --git a/src/plugin-main.cpp b/src/plugin-main.cpp -index 0d94add..617af73 100644 +index 43f0e28..5e393c6 100644 --- a/src/plugin-main.cpp +++ b/src/plugin-main.cpp -@@ -369,14 +369,7 @@ const NDIlib_v5 *load_ndilib() +@@ -412,14 +412,7 @@ const NDIlib_v5 *load_ndilib() if (!temp_path.isEmpty()) { locations << temp_path; } @@ -15,4 +15,6 @@ index 0d94add..617af73 100644 - locations << "/usr/local/lib"; -#endif + locations << "@NDI@/lib"; - auto lib_path = QString(); + auto lib_path = QString(); + #if defined(Q_OS_LINUX) + // Linux