From fc5965587a24b6eaf1e851292c5309955c3647fd Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 18 Oct 2023 11:46:47 +0000 Subject: [PATCH 1/2] mpvScripts.mpvacious: Refactor with `buildLua` & upstream's `install` target --- pkgs/applications/video/mpv/scripts/default.nix | 2 +- pkgs/applications/video/mpv/scripts/mpvacious.nix | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 94c59fa8b068..7ddb4cb2a993 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -16,7 +16,7 @@ in lib.recurseIntoAttrs mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; mpv-webm = callPackage ./mpv-webm.nix { }; - mpvacious = callPackage ./mpvacious.nix { }; + mpvacious = callPackage ./mpvacious.nix { inherit buildLua; }; quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; sponsorblock = callPackage ./sponsorblock.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index d2f2434fda11..c7b44dd16c61 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,12 +1,12 @@ { lib -, stdenvNoCC +, buildLua , fetchFromGitHub , curl , wl-clipboard , xclip }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpvacious"; version = "0.24"; @@ -26,23 +26,16 @@ stdenvNoCC.mkDerivation rec { --replace "'xclip" "'${xclip}/bin/xclip" ''; - dontBuild = true; - installPhase = '' runHook preInstall - rm -r .github - mkdir -p $out/share/mpv/scripts - cp -r . $out/share/mpv/scripts/mpvacious + make PREFIX=$out/share/mpv install runHook postInstall ''; - passthru.scriptName = "mpvacious"; - meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows"; homepage = "https://github.com/Ajatt-Tools/mpvacious"; license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = with maintainers; [ kmicklas ]; }; } From f0d0f400394668793b2bb7fb13a15711c90d8108 Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 9 Nov 2023 16:53:03 +0000 Subject: [PATCH 2/2] =?UTF-8?q?mpvScripts.mpvacious:=200.24=20=E2=86=92=20?= =?UTF-8?q?0.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/mpv/scripts/mpvacious.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index c7b44dd16c61..93e1402289cd 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -8,13 +8,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.24"; + version = "0.25"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-o0YcoSI+4934HlyIoI5V1h/FalCe+6tXS8Lg6kXWjSg="; + sha256 = "sha256-XTnib4cguWFEvZtmsLfkesbjFbkt2YoyYLT587ajyUM="; }; postPatch = ''