b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
06kellyjac 2022-08-15 12:33:31 +01:00
parent 441dc5d512
commit 342d67be61
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/video/obs-studio/wrapper.nix
View file

@ -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;