From 14d0e5ad9f123f0d4aabacc9a3ec4ff6ac4be78a Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Tue, 28 Sep 2021 15:33:25 -0400 Subject: [PATCH] mpvacious: 0.14 -> 0.15 --- .../video/mpv/scripts/mpvacious.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 3225317d78bc..9ddd6e308c3b 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,19 +1,29 @@ -{ lib, stdenvNoCC, fetchFromGitHub, curl, xclip }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, curl +, wl-clipboard +, xclip +}: stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "0r031hh3hpim9dli15m9q4cwka4ljvwg0hdgyp36r1n097q44r5f"; + sha256 = "1lxlgbjk4x3skg5s7kkr9llcdlmpmabfrcslwhhz5f4j3bq7498w"; }; 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" ''; @@ -21,12 +31,12 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/mpv/scripts - cp subs2srs.lua $out/share/mpv/scripts + mkdir -p $out/share/mpv/scripts/mpvacious + cp *.lua $out/share/mpv/scripts/mpvacious runHook postInstall ''; - passthru.scriptName = "subs2srs.lua"; + passthru.scriptName = "mpvacious/subs2srs.lua"; meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows";