Commit c312f6f8 authored by Augustin Trancart's avatar Augustin Trancart
Browse files

opencv: fix protobuf support 

See https://github.com/opencv/opencv/blob/4.11.0/cmake/OpenCVFindProtobuf.cmake#L81

Only protobuf <= 22 will work with the current CXX standard version.
parent 2b2a1378

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

+3 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
  glib,

  glog,

  gflags,

  protobuf_29,

  protobuf_21,

  config,

  ocl-icd,

  qimgv,
@@ -337,7 +337,7 @@ effectiveStdenv.mkDerivation { 
      glib

      glog

      pcre2

      protobuf_29

      protobuf_21

      zlib

    ]

    ++ optionals enablePython [
@@ -471,6 +471,7 @@ effectiveStdenv.mkDerivation { 
      (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)

      (cmakeBool "WITH_OPENMP" true)

      (cmakeBool "BUILD_PROTOBUF" false)

      (cmakeBool "WITH_PROTOBUF" true)

      (cmakeBool "PROTOBUF_UPDATE_FILES" true)

      (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)

      (cmakeBool "BUILD_TESTS" runAccuracyTests)