forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 persepolisdm/persepolis#930
- Loading branch information
1 parent
89f0233
commit 979c152
Showing
2 changed files
with
37 additions
and
1 deletion.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters