Skip to content

Commit

Permalink
persepolis: fix error when opening video finder
Browse files Browse the repository at this point in the history
The video finder is still broken on youtube, but that's an upstream
issue that we might not want to fix ourselves, see
persepolisdm/persepolis#930
  • Loading branch information
iFreilicht authored and wegank committed Nov 10, 2023
1 parent 89f0233 commit 979c152
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -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)

4 changes: 3 additions & 1 deletion pkgs/tools/networking/persepolis/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
, buildPythonApplication
, fetchFromGitHub
, aria
, ffmpeg
, libnotify
, pulseaudio
, psutil
Expand Down Expand Up @@ -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 = ''
Expand All @@ -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[@]}"
];

Expand Down

0 comments on commit 979c152

Please sign in to comment.