diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-06-07 15:39:09 +0300 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-06-12 11:55:31 -0700 |
commit | 01d4e2fe332420684803170597d1b88e9f826303 (patch) | |
tree | 0a998e2bf5326595ec4a1fcffad7bfd963760dad /pkgs/development/python-modules/imageio/default.nix | |
parent | 8e1dcea3d575dfd4ecdee336e5b95c093f3017cb (diff) | |
download | nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.gz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.bz2 nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.lz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.xz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.zst nixlib-01d4e2fe332420684803170597d1b88e9f826303.zip |
treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change.
Diffstat (limited to 'pkgs/development/python-modules/imageio/default.nix')
-rw-r--r-- | pkgs/development/python-modules/imageio/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 5433e1ea9e41..ebb7f86f5afb 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -8,7 +8,7 @@ , pytest , numpy , isPy3k -, ffmpeg +, ffmpeg_3 , futures , enum34 }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg + imageio-ffmpeg ffmpeg_3 ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures |