Merge pull request #139795 from kmicklas/mpvacious-0.15

authored by

Sandro and committed by
GitHub
0b4d5ebd 761a16cb

+16 -6
+16 -6
pkgs/applications/video/mpv/scripts/mpvacious.nix
··· 1 - { lib, stdenvNoCC, fetchFromGitHub, curl, xclip }: 1 + { lib 2 + , stdenvNoCC 3 + , fetchFromGitHub 4 + , curl 5 + , wl-clipboard 6 + , xclip 7 + }: 2 8 3 9 stdenvNoCC.mkDerivation rec { 4 10 pname = "mpvacious"; 5 - version = "0.14"; 11 + version = "0.15"; 6 12 7 13 src = fetchFromGitHub { 8 14 owner = "Ajatt-Tools"; 9 15 repo = "mpvacious"; 10 16 rev = "v${version}"; 11 - sha256 = "0r031hh3hpim9dli15m9q4cwka4ljvwg0hdgyp36r1n097q44r5f"; 17 + sha256 = "1lxlgbjk4x3skg5s7kkr9llcdlmpmabfrcslwhhz5f4j3bq7498w"; 12 18 }; 13 19 14 20 postPatch = '' 21 + # 'require' replaced with 'dofile' to work around 22 + # https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious 15 23 substituteInPlace subs2srs.lua \ 24 + --replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \ 16 25 --replace "'curl'" "'${curl}/bin/curl'" \ 26 + --replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \ 17 27 --replace "xclip" "${xclip}/bin/xclip" 18 28 ''; 19 29 ··· 21 31 22 32 installPhase = '' 23 33 runHook preInstall 24 - mkdir -p $out/share/mpv/scripts 25 - cp subs2srs.lua $out/share/mpv/scripts 34 + mkdir -p $out/share/mpv/scripts/mpvacious 35 + cp *.lua $out/share/mpv/scripts/mpvacious 26 36 runHook postInstall 27 37 ''; 28 38 29 - passthru.scriptName = "subs2srs.lua"; 39 + passthru.scriptName = "mpvacious/subs2srs.lua"; 30 40 31 41 meta = with lib; { 32 42 description = "Adds mpv keybindings to create Anki cards from movies and TV shows";