From f24a49a7caa3a798dfc37eefe770fcca5648ccf2 Mon Sep 17 00:00:00 2001 From: Thibault Maekelbergh <6213695+thibmaek@users.noreply.github.com> Date: Mon, 14 Jul 2025 21:58:13 +0200 Subject: [PATCH 1/2] Add Nix path to ffmpeg locations on macOS --- src/tagstudio/qt/helpers/vendored/ffmpeg.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/tagstudio/qt/helpers/vendored/ffmpeg.py b/src/tagstudio/qt/helpers/vendored/ffmpeg.py index 4fd5184f9..4a5527d3a 100644 --- a/src/tagstudio/qt/helpers/vendored/ffmpeg.py +++ b/src/tagstudio/qt/helpers/vendored/ffmpeg.py @@ -15,7 +15,13 @@ logger = structlog.get_logger(__name__) -FFMPEG_MACOS_LOCATIONS: list[str] = ["", "/opt/homebrew/bin/", "/usr/local/bin/"] +user = os.environ["USER"] +FFMPEG_MACOS_LOCATIONS: list[str] = [ + "", + "/opt/homebrew/bin/", + "/usr/local/bin/", + f"/etc/profiles/per-user/{user}/bin" +] def _get_ffprobe_location() -> str: From 7b63a9067690f8ff31ccfd0e048d6b95cfcd921e Mon Sep 17 00:00:00 2001 From: Thibault Maekelbergh Date: Sun, 3 Aug 2025 09:23:57 +0200 Subject: [PATCH 2/2] Add 'os' import --- src/tagstudio/qt/helpers/vendored/ffmpeg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tagstudio/qt/helpers/vendored/ffmpeg.py b/src/tagstudio/qt/helpers/vendored/ffmpeg.py index 4a5527d3a..c2c9a80ed 100644 --- a/src/tagstudio/qt/helpers/vendored/ffmpeg.py +++ b/src/tagstudio/qt/helpers/vendored/ffmpeg.py @@ -4,6 +4,7 @@ import contextlib import json +import os import platform import subprocess from shutil import which @@ -20,7 +21,7 @@ "", "/opt/homebrew/bin/", "/usr/local/bin/", - f"/etc/profiles/per-user/{user}/bin" + f"/etc/profiles/per-user/{user}/bin", ]