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

obs-studio: include plugins in wrapper again

Browse source 
If the user asks for a plugin that does come with their own binaries or other
files to be included in their OBS installation, it should include those files. A
good example is obs-vkcapture which /requires/ system-wide files to have any use
whatsoever.

Plugins' paths were removed from the wrapper in step with preventing OBS from
loading plugins twice but wasn't actually required because the env variables
already point at the one and only location for plugins. The plugins' share dirs
don't get put in the system-wide share by default on NixOS but I decided to
remove the directory anyways for clarity.

Partially reverts 593d64f975

Co-authored-by: Pedro Lara Campos <pedro.laracampos@gmail.com>
This commit is contained in:
Atemu 2022-09-01 23:08:43 +02:00
parent 97747d3209
commit c5e6fb193b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ symlinkJoin {
name = "wrapped-${obs-studio.name}";
nativeBuildInputs = [ makeWrapper ];
paths = [ obs-studio ];
paths = [ obs-studio ] ++ plugins;
postBuild = with lib;
let
@ -19,13 +19,20 @@ symlinkJoin {
paths = plugins;
};
wrapCommand = [
wrapCommandLine = [
"wrapProgram"
"$out/bin/obs"
''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"''
''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"''
] ++ pluginArguments;
in concatStringsSep " " wrapCommand;
in ''
${concatStringsSep " " wrapCommandLine}
# Remove unused obs-plugins dir to not cause confusion
rm -r $out/share/obs/obs-plugins
# Leave some breadcrumbs
echo 'Plugins are at ${pluginsJoined}/share/obs/obs-plugins' > $out/share/obs/obs-plugins-README
'';
inherit (obs-studio) meta;
passthru = obs-studio.passthru // {