dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

opencv4: use ffmpeg instead of ffmpeg_3

Browse Source
This commit is contained in:
Robert Schütz 2021-05-17 12:57:09 +02:00
parent 1e85864c6f
commit c2161e94f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opencv/4.x.nix
View File

@ -45,7 +45,7 @@
, enableVtk ? false , enableVtk ? false
, vtk , vtk
, enableFfmpeg ? true , enableFfmpeg ? true
, ffmpeg_3 , ffmpeg
, enableGStreamer ? true , enableGStreamer ? true
, gst_all_1 , gst_all_1
, enableTesseract ? false , enableTesseract ? false
@ -252,7 +252,7 @@ stdenv.mkDerivation {
++ lib.optional enableTIFF libtiff ++ lib.optional enableTIFF libtiff
++ lib.optional enableWebP libwebp ++ lib.optional enableWebP libwebp
++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals (enableFfmpeg && stdenv.isDarwin) ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ] [ VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])