mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-15 21:57:02 +03:00
opencv2: use ffmpeg instead of ffmpeg_3
This commit is contained in:
parent
d8f202e83e
commit
242f2064f5
@ -6,7 +6,7 @@
|
||||
, enablePNG ? true, libpng
|
||||
, enableTIFF ? true, libtiff
|
||||
, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
|
||||
, enableFfmpeg ? false, ffmpeg_3
|
||||
, enableFfmpeg ? false, ffmpeg
|
||||
, enableGStreamer ? false, gst_all_1
|
||||
, enableEigen ? true, eigen
|
||||
, Cocoa, QTKit
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional enablePNG libpng
|
||||
++ lib.optional enableTIFF libtiff
|
||||
++ lib.optionals enableEXR [ openexr ilmbase ]
|
||||
++ lib.optional enableFfmpeg ffmpeg_3
|
||||
++ lib.optional enableFfmpeg ffmpeg
|
||||
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
|
||||
++ lib.optional enableEigen eigen
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]
|
||||
|
Loading…
Reference in New Issue
Block a user