diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-05-17 12:57:09 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-05-17 12:57:09 +0200 |
| commit | c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa (patch) | |
| tree | 112add068a34f2279ab8715deeac792f4e29bbd6 /pkgs/development/libraries/opencv | |
| parent | 1e85864c6f7afe8ba44ee0cde0ad29f9ab80c137 (diff) | |
| download | nixpkgs-c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa.tar nixpkgs-c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa.tar.gz nixpkgs-c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa.tar.bz2 nixpkgs-c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa.tar.lz nixpkgs-c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa.tar.xz nixpkgs-c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa.tar.zst nixpkgs-c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa.zip | |
opencv4: use ffmpeg instead of ffmpeg_3
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 15c8d46b613..58609a9186d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -45,7 +45,7 @@ , enableVtk ? false , vtk , enableFfmpeg ? true -, ffmpeg_3 +, ffmpeg , enableGStreamer ? true , gst_all_1 , enableTesseract ? false @@ -252,7 +252,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableFfmpeg ffmpeg_3 + ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) |