From 81d6df0268747d1a32ea85d37b4276fd23a9795d Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 15:43:58 +0000 Subject: [PATCH] mpvScripts: Avoid mixing `//` and `callPackage` This will avoid an infinite recursion issue when turned into a scope --- pkgs/applications/video/mpv/scripts/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 3520138a7d60..a3de7e315a2b 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -58,6 +58,11 @@ in lib.recurseIntoAttrs (lib.mapAttrs addTests ({ + inherit (callPackage ./mpv.nix { inherit buildLua; }) + acompressor autocrop autodeint autoload; + inherit (callPackage ./occivink.nix { inherit buildLua; }) + blacklistExtensions seekTo; + chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; convert = callPackage ./convert.nix { inherit buildLua; }; cutter = callPackage ./cutter.nix { inherit buildLua; }; @@ -76,9 +81,7 @@ lib.recurseIntoAttrs visualizer = callPackage ./visualizer.nix { inherit buildLua; }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - } - // (callPackage ./mpv.nix { inherit buildLua; }) - // (callPackage ./occivink.nix { inherit buildLua; }))) + })) // lib.optionalAttrs config.allowAliases { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 }