diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-05-17 12:58:16 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-05-17 12:58:16 +0200 |
| commit | d8f202e83ebae724a5bd1318c12d7721326222bc (patch) | |
| tree | 18090462fe4c4b0b0cd907228b58e31a657eeeb8 /pkgs/development/libraries/opencv | |
| parent | c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa (diff) | |
| download | nixpkgs-d8f202e83ebae724a5bd1318c12d7721326222bc.tar nixpkgs-d8f202e83ebae724a5bd1318c12d7721326222bc.tar.gz nixpkgs-d8f202e83ebae724a5bd1318c12d7721326222bc.tar.bz2 nixpkgs-d8f202e83ebae724a5bd1318c12d7721326222bc.tar.lz nixpkgs-d8f202e83ebae724a5bd1318c12d7721326222bc.tar.xz nixpkgs-d8f202e83ebae724a5bd1318c12d7721326222bc.tar.zst nixpkgs-d8f202e83ebae724a5bd1318c12d7721326222bc.zip | |
opencv3: use ffmpeg instead of ffmpeg_3
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a65e978f981..33b1cd18757 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -22,7 +22,7 @@ , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg_3 +, enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica , enableTbb ? false, tbb @@ -188,7 +188,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 ]) |