diff options
Diffstat (limited to 'pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch')
| -rw-r--r-- | pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch index 33e2f9695d80e..aef4d1f2364fc 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch +++ b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch @@ -1,16 +1,13 @@ -diff --git a/imageio_ffmpeg/_utils.py b/imageio_ffmpeg/_utils.py -index 6387834..e5e312d 100644 --- a/imageio_ffmpeg/_utils.py +++ b/imageio_ffmpeg/_utils.py -@@ -38,29 +38,7 @@ def get_ffmpeg_exe(): +@@ -38,28 +38,7 @@ def get_ffmpeg_exe(): @lru_cache() def _get_ffmpeg_exe(): - plat = get_platform() - - # 2. Try from here -- bin_dir = resource_filename("imageio_ffmpeg", "binaries") -- exe = os.path.join(bin_dir, FNAME_PER_PLATFORM.get(plat, "")) +- exe = os.path.join(_get_bin_dir(), FNAME_PER_PLATFORM.get(plat, "")) - if exe and os.path.isfile(exe) and _is_valid_exe(exe): - return exe - @@ -32,4 +29,4 @@ index 6387834..e5e312d 100644 + return "@ffmpeg@" - def _popen_kwargs(prevent_sigint=False): + def _get_bin_dir(): |