From 342d67be61a28c840c945875908dcedeebd74bec Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 15 Aug 2022 12:33:31 +0100 Subject: [PATCH] obs-studio: resolve failed wrapping if a plugin has no data path fixes a regression due to #186548 where the symlinkJoin fails when a package does not have that path such as `obs-studio-plugins.wlrobs` Only one `symlinkJoin` is necessary --- pkgs/applications/video/obs-studio/wrapper.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 3b98385a869e..28efefbd0042 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -16,19 +16,14 @@ symlinkJoin { pluginsJoined = symlinkJoin { name = "obs-studio-plugins"; - paths = lists.map (plugin: "${plugin}/lib/obs-plugins") plugins; - }; - - pluginsDataJoined = symlinkJoin { - name = "obs-studio-plugins-data"; - paths = lists.map (plugin: "${plugin}/share/obs/obs-plugins") plugins; + paths = plugins; }; wrapCommand = [ "wrapProgram" "$out/bin/obs" - ''--set OBS_PLUGINS_PATH "${pluginsJoined}"'' - ''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"'' + ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' + ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' ] ++ pluginArguments; in concatStringsSep " " wrapCommand;