Merge pull request #186787 from 06kellyjac/obs-wrapper

obs-studio: resolve failed wrapping if a plugin has no data path

authored by superherointj and committed by GitHub e51e218d 50c0564b

+3 -8
+3 -8
pkgs/applications/video/obs-studio/wrapper.nix
··· 16 16 17 17 pluginsJoined = symlinkJoin { 18 18 name = "obs-studio-plugins"; 19 - paths = lists.map (plugin: "${plugin}/lib/obs-plugins") plugins; 20 - }; 21 - 22 - pluginsDataJoined = symlinkJoin { 23 - name = "obs-studio-plugins-data"; 24 - paths = lists.map (plugin: "${plugin}/share/obs/obs-plugins") plugins; 19 + paths = plugins; 25 20 }; 26 21 27 22 wrapCommand = [ 28 23 "wrapProgram" 29 24 "$out/bin/obs" 30 - ''--set OBS_PLUGINS_PATH "${pluginsJoined}"'' 31 - ''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"'' 25 + ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' 26 + ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' 32 27 ] ++ pluginArguments; 33 28 in concatStringsSep " " wrapCommand; 34 29