From b52821ab35eb76d4a226d842aff38d5c5fc16618 Mon Sep 17 00:00:00 2001 From: Dan Xin Date: Sun, 22 Jun 2025 19:22:21 +0800 Subject: [PATCH 1/2] ffsubsync: remove future dependency --- pkgs/by-name/ff/ffsubsync/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index 5e7e1dea7679..227181e043aa 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { charset-normalizer faust-cchardet ffmpeg-python - future numpy pkgs.ffmpeg pysubs2 From 3c1b4354271e640af32f4760d24c9ce2b34bcaed Mon Sep 17 00:00:00 2001 From: Dan Xin Date: Mon, 23 Jun 2025 22:08:39 +0800 Subject: [PATCH 2/2] ffsubsync: update ffmpeg dependency handling and adjust wrapper arguments --- pkgs/by-name/ff/ffsubsync/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index 227181e043aa..b3940c53a01e 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -2,6 +2,7 @@ lib, python3, fetchFromGitHub, + ffmpeg, }: python3.pkgs.buildPythonApplication rec { @@ -24,7 +25,6 @@ python3.pkgs.buildPythonApplication rec { faust-cchardet ffmpeg-python numpy - pkgs.ffmpeg pysubs2 chardet rich @@ -40,6 +40,13 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "ffsubsync" ]; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + "${ffmpeg}/bin" + ]; + meta = { homepage = "https://github.com/smacke/ffsubsync"; description = "Automagically synchronize subtitles with video";