Unverified Commit 80335610 authored by Pol Dellaiera's avatar Pol Dellaiera
Browse files

python3Packages.pydub: fix paths to `ffmpeg`, `ffplay` and `ffprobe`

parent 715b4dad
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
  pytestCheckHook,
  pythonOlder,
  setuptools,
  substituteAll,
}:

buildPythonPackage rec {
@@ -30,12 +31,18 @@ buildPythonPackage rec {
      url = "https://github.com/jiaaro/pydub/commit/66c1bf7813ae8621a71484fdcdf609734c0d8efd.patch";
      hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A=";
    })
    # Fix paths to ffmpeg, ffplay and ffprobe
    (substituteAll {
      src = ./ffmpeg-fix-path.patch;
      ffmpeg = lib.getExe ffmpeg-full;
      ffplay = lib.getExe' ffmpeg-full "ffplay";
      ffprobe = lib.getExe' ffmpeg-full "ffprobe";
    })
  ];

  nativeBuildInputs = [ setuptools ];

  nativeCheckInputs = [
    ffmpeg-full
    pytestCheckHook
  ];

+28 −0
Original line number Diff line number Diff line
diff --git a/pydub/utils.py b/pydub/utils.py
index 2694f90..7764b3f 100644
--- a/pydub/utils.py
+++ b/pydub/utils.py
@@ -172,7 +172,7 @@ def get_encoder_name():
     else:
         # should raise exception
         warn("Couldn't find ffmpeg or avconv - defaulting to ffmpeg, but may not work", RuntimeWarning)
-        return "ffmpeg"
+        return "@ffmpeg@"


 def get_player_name():
@@ -186,7 +186,7 @@ def get_player_name():
     else:
         # should raise exception
         warn("Couldn't find ffplay or avplay - defaulting to ffplay, but may not work", RuntimeWarning)
-        return "ffplay"
+        return "@ffplay@"


 def get_prober_name():
@@ -200,7 +200,7 @@ def get_prober_name():
     else:
         # should raise exception
         warn("Couldn't find ffprobe or avprobe - defaulting to ffprobe, but may not work", RuntimeWarning)
-        return "ffprobe"
+        return "@ffprobe@"