summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/video/mpv
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2022-08-13 10:54:36 -0400
committerGitHub <noreply@github.com>2022-08-13 10:54:36 -0400
commit91e3af4efba570a9b7fb6a069783fcd85f311247 (patch)
tree2e64d36c06ae9e1e173cb24d64a1f12c68c87c01 /pkgs/applications/video/mpv
parent0a1d5ca3c15bbd55fff81aa0181f71eab68dced4 (diff)
parent90bfb6dc4b5407fe6b52988c6261e97343cc3e4e (diff)
Merge pull request #156241 from kmicklas/fix-mpvacious-multi-file-hack
mpvacious: remove hack for multi-file script loading
Diffstat (limited to 'pkgs/applications/video/mpv')
-rw-r--r--pkgs/applications/video/mpv/scripts/mpvacious.nix5
1 files changed, 1 insertions, 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";