diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
| commit | 1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02 (patch) | |
| tree | bae982223d71e1d3760d022a26f2e06b7202e255 /pkgs/development/python-modules/imageio | |
| parent | 98f95ef9c4559c96cf852e5c0dae1d5124145a78 (diff) | |
| parent | 0905a5d99031c213c20c962e9501a2202602741b (diff) | |
| download | nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.gz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.bz2 nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.lz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.xz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.zst nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/imageio')
| -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 |