Merge pull request #186548 from miangraham/obs-studio-wrapper-plugins-fix
obs-studio: Fix wrapOBS double-including the built-in plugins
This commit is contained in:
commit
6eafd38b2f
|
@ -8481,6 +8481,15 @@
|
||||||
githubId = 9980864;
|
githubId = 9980864;
|
||||||
name = "Max Hofer";
|
name = "Max Hofer";
|
||||||
};
|
};
|
||||||
|
miangraham = {
|
||||||
|
email = "miangraham@users.noreply.github.com";
|
||||||
|
github = "miangraham";
|
||||||
|
githubId = 704580;
|
||||||
|
name = "M. Ian Graham";
|
||||||
|
keys = [{
|
||||||
|
fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F";
|
||||||
|
}];
|
||||||
|
};
|
||||||
mic92 = {
|
mic92 = {
|
||||||
email = "joerg@thalheim.io";
|
email = "joerg@thalheim.io";
|
||||||
matrix = "@mic92:nixos.dev";
|
matrix = "@mic92:nixos.dev";
|
||||||
|
|
|
@ -140,7 +140,7 @@ mkDerivation rec {
|
||||||
video content, efficiently
|
video content, efficiently
|
||||||
'';
|
'';
|
||||||
homepage = "https://obsproject.com";
|
homepage = "https://obsproject.com";
|
||||||
maintainers = with maintainers; [ jb55 MP2E V ];
|
maintainers = with maintainers; [ jb55 MP2E V miangraham ];
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||||
mainProgram = "obs";
|
mainProgram = "obs";
|
||||||
|
|
|
@ -6,7 +6,7 @@ symlinkJoin {
|
||||||
name = "wrapped-${obs-studio.name}";
|
name = "wrapped-${obs-studio.name}";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
paths = [ obs-studio ] ++ plugins;
|
paths = [ obs-studio ];
|
||||||
|
|
||||||
postBuild = with lib;
|
postBuild = with lib;
|
||||||
let
|
let
|
||||||
|
@ -14,11 +14,21 @@ symlinkJoin {
|
||||||
pluginArguments =
|
pluginArguments =
|
||||||
lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins;
|
lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins;
|
||||||
|
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
|
||||||
wrapCommand = [
|
wrapCommand = [
|
||||||
"wrapProgram"
|
"wrapProgram"
|
||||||
"$out/bin/obs"
|
"$out/bin/obs"
|
||||||
''--set OBS_PLUGINS_PATH "$out/lib/obs-plugins"''
|
''--set OBS_PLUGINS_PATH "${pluginsJoined}"''
|
||||||
''--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"''
|
''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"''
|
||||||
] ++ pluginArguments;
|
] ++ pluginArguments;
|
||||||
in concatStringsSep " " wrapCommand;
|
in concatStringsSep " " wrapCommand;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue