persepolis: fix error when opening video finder

The video finder is still broken on youtube, but that's an upstream
issue that we might not want to fix ourselves, see
https://github.com/persepolisdm/persepolis/issues/930
This commit is contained in:
Felix Uhl 2023-11-07 12:35:34 +01:00 committed by Weijia Wang
parent 89f023360c
commit 979c1528c5
2 changed files with 37 additions and 1 deletions

View file

@ -0,0 +1,34 @@
---
persepolis/scripts/mainwindow.py | 2 +-
persepolis/scripts/useful_tools.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/persepolis/scripts/mainwindow.py b/persepolis/scripts/mainwindow.py
index d21f3f4..a0e3674 100644
--- a/persepolis/scripts/mainwindow.py
+++ b/persepolis/scripts/mainwindow.py
@@ -161,7 +161,7 @@ class CheckVersionsThread(QThread):
else:
pipe = subprocess.Popen(
- [ffmpeg_path, '-version'],
+ ['ffmpeg', '-version'],
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stderr=subprocess.PIPE,
diff --git a/persepolis/scripts/useful_tools.py b/persepolis/scripts/useful_tools.py
index b780967..31733eb 100644
--- a/persepolis/scripts/useful_tools.py
+++ b/persepolis/scripts/useful_tools.py
@@ -342,7 +342,7 @@ def muxer(parent, video_finder_dictionary):
current_directory = os.path.dirname(cwd)
ffmpeg_path = os.path.join(current_directory, 'ffmpeg')
- pipe = subprocess.Popen([ffmpeg_path, '-i', video_file_path,
+ pipe = subprocess.Popen(['ffmpeg', '-i', video_file_path,
'-i', audio_file_path,
'-c', 'copy',
'-shortest',
--
2.39.3 (Apple Git-145)

View file

@ -3,6 +3,7 @@
, buildPythonApplication
, fetchFromGitHub
, aria
, ffmpeg
, libnotify
, pulseaudio
, psutil
@ -37,6 +38,7 @@ buildPythonApplication rec {
./0001-Allow-building-on-darwin.patch
./0002-Fix-startup-crash-on-darwin.patch
./0003-Search-PATH-for-aria2c-on-darwin.patch
./0004-Search-PATH-for-ffmpeg-on-darwin.patch
];
postPatch = ''
@ -55,7 +57,7 @@ buildPythonApplication rec {
# feed args to wrapPythonApp
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [ aria libnotify ]}"
"--prefix PATH : ${lib.makeBinPath [ aria ffmpeg libnotify ]}"
"\${qtWrapperArgs[@]}"
];