From 90bfb6dc4b5407fe6b52988c6261e97343cc3e4e Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Sat, 22 Jan 2022 20:10:02 -0500 Subject: [PATCH] mpvacious: remove hack for multi-file script loading --- pkgs/applications/video/mpv/scripts/mpvacious.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 9ddd6e308c3b..071f762ff4a7 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -18,10 +18,7 @@ stdenvNoCC.mkDerivation rec { }; postPatch = '' - # 'require' replaced with 'dofile' to work around - # https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious substituteInPlace subs2srs.lua \ - --replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \ --replace "'curl'" "'${curl}/bin/curl'" \ --replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \ --replace "xclip" "${xclip}/bin/xclip" @@ -36,7 +33,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.scriptName = "mpvacious/subs2srs.lua"; + passthru.scriptName = "mpvacious"; meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows";