diff options
| author | M. Ian Graham <games@miangraham.com> | 2022-08-14 08:37:29 +0900 |
|---|---|---|
| committer | M. Ian Graham <games@miangraham.com> | 2022-08-14 23:39:00 +0900 |
| commit | 593d64f975e4e7d9439562d3f857d85e8be66012 (patch) | |
| tree | c886b9b9bc019c9d9fc0c8b9e476fe0bd6012f33 /pkgs | |
| parent | 38489456112a2196a4ccba223ebfedec13dd3c60 (diff) | |
obs-studio: Fix wrapOBS double-including the built-in plugins
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/wrapper.nix | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 83514923331ab..044967b2e526b 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -140,7 +140,7 @@ mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V ]; + maintainers = with maintainers; [ jb55 MP2E V miangraham ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 80880d9318d97..3b98385a869ed 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -6,7 +6,7 @@ symlinkJoin { name = "wrapped-${obs-studio.name}"; nativeBuildInputs = [ makeWrapper ]; - paths = [ obs-studio ] ++ plugins; + paths = [ obs-studio ]; postBuild = with lib; let @@ -14,11 +14,21 @@ symlinkJoin { pluginArguments = 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 = [ "wrapProgram" "$out/bin/obs" - ''--set OBS_PLUGINS_PATH "$out/lib/obs-plugins"'' - ''--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"'' + ''--set OBS_PLUGINS_PATH "${pluginsJoined}"'' + ''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"'' ] ++ pluginArguments; in concatStringsSep " " wrapCommand; |