From ab2df8282fc5a565726b936f236e8bbbf3703807 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 21:02:48 +0000 Subject: [PATCH 1/2] =?UTF-8?q?mpvScripts.thumbfast:=20unstable-2023-06-04?= =?UTF-8?q?=20=E2=86=92=202023-12-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/mpv/scripts/thumbfast.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 0226074ca31b..ad0c2d574807 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -2,13 +2,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "unstable-2023-06-04"; + version = "unstable-2023-12-08"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "4241c7daa444d3859b51b65a39d30e922adb87e9"; - hash = "sha256-7EnFJVjEzqhWXAvhzURoOp/kad6WzwyidWxug6u8lVw="; + rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; + hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; }; postPatch = '' From 41fe0777299eb131745747323241b2085569184b Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 21:09:09 +0000 Subject: [PATCH 2/2] mpvScripts.thumbfast: bring `mpv` in `PATH` instead of patching its path in This should be more robust against upstream changes, and does not require a rebuild after every mpv rebuild. --- pkgs/applications/video/mpv/scripts/thumbfast.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index ad0c2d574807..4899f556e8b2 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -11,13 +11,12 @@ buildLua { hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; }; - postPatch = '' - substituteInPlace thumbfast.lua \ - --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"' - ''; - scriptPath = "thumbfast.lua"; + passthru.extraWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin" + ]; + meta = { description = "High-performance on-the-fly thumbnailer for mpv"; homepage = "https://github.com/po5/thumbfast";