diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-05-17 13:00:34 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-05-17 13:00:34 +0200 |
| commit | 242f2064f5acf39f15edbf5c9cf2b27f44bea7d7 (patch) | |
| tree | aac9b8b4745e741bed3905dcfb61f91c4a8de98c /pkgs/development/libraries/opencv | |
| parent | d8f202e83ebae724a5bd1318c12d7721326222bc (diff) | |
| download | nixpkgs-242f2064f5acf39f15edbf5c9cf2b27f44bea7d7.tar nixpkgs-242f2064f5acf39f15edbf5c9cf2b27f44bea7d7.tar.gz nixpkgs-242f2064f5acf39f15edbf5c9cf2b27f44bea7d7.tar.bz2 nixpkgs-242f2064f5acf39f15edbf5c9cf2b27f44bea7d7.tar.lz nixpkgs-242f2064f5acf39f15edbf5c9cf2b27f44bea7d7.tar.xz nixpkgs-242f2064f5acf39f15edbf5c9cf2b27f44bea7d7.tar.zst nixpkgs-242f2064f5acf39f15edbf5c9cf2b27f44bea7d7.zip | |
opencv2: use ffmpeg instead of ffmpeg_3
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 2575f6bb45d..005257780e4 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -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 ] |