opencv(4), opencv3: switch to older protobuf

https://hydra.nixos.org/build/231540730
https://hydra.nixos.org/build/231464517

Changed files
+5 -5
pkgs
development
libraries
opencv
+2 -2
pkgs/development/libraries/opencv/3.x.nix
···
, fetchFromGitHub
, fetchpatch
, cmake, pkg-config, unzip, zlib, pcre, hdf5
-
, glog, boost, gflags, protobuf
, config
, enableJPEG ? true, libjpeg
···
buildInputs =
[ zlib pcre hdf5 glog boost gflags ]
-
++ lib.optional useSystemProtobuf protobuf
++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
···
, fetchFromGitHub
, fetchpatch
, cmake, pkg-config, unzip, zlib, pcre, hdf5
+
, glog, boost, gflags, protobuf3_21
, config
, enableJPEG ? true, libjpeg
···
buildInputs =
[ zlib pcre hdf5 glog boost gflags ]
+
++ lib.optional useSystemProtobuf protobuf3_21
++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
+3 -3
pkgs/development/libraries/opencv/4.x.nix
···
, hdf5
, boost
, gflags
-
, protobuf
, config
, ocl-icd
, buildPackages
···
echo '"(build info elided)"' > modules/core/version_string.inc
'';
-
buildInputs = [ zlib pcre boost gflags protobuf ]
++ lib.optional enablePython pythonPackages.python
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2
···
"-DOPENCV_GENERATE_PKGCONFIG=ON"
"-DWITH_OPENMP=ON"
"-DBUILD_PROTOBUF=OFF"
-
"-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}"
"-DPROTOBUF_UPDATE_FILES=ON"
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
"-DBUILD_TESTS=${printEnabled runAccuracyTests}"
···
, hdf5
, boost
, gflags
+
, protobuf3_21
, config
, ocl-icd
, buildPackages
···
echo '"(build info elided)"' > modules/core/version_string.inc
'';
+
buildInputs = [ zlib pcre boost gflags protobuf3_21 ]
++ lib.optional enablePython pythonPackages.python
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2
···
"-DOPENCV_GENERATE_PKGCONFIG=ON"
"-DWITH_OPENMP=ON"
"-DBUILD_PROTOBUF=OFF"
+
"-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}"
"-DPROTOBUF_UPDATE_FILES=ON"
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
"-DBUILD_TESTS=${printEnabled runAccuracyTests}"