Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/development/libraries/opencv/4.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
glib,
glog,
gflags,
protobuf_21,
protobuf,
config,
ocl-icd,
qimgv,
Expand Down Expand Up @@ -335,7 +335,7 @@ effectiveStdenv.mkDerivation {
glib
glog
pcre2
protobuf_21
protobuf
zlib
]
++ optionals enablePython [
Expand Down Expand Up @@ -468,6 +468,7 @@ effectiveStdenv.mkDerivation {
(cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
(cmakeBool "WITH_OPENMP" true)
(cmakeBool "BUILD_PROTOBUF" false)
(cmakeFeature "CMAKE_CXX_STANDARD" "17") # required to enable protobuf
(cmakeBool "WITH_PROTOBUF" true)
(cmakeBool "PROTOBUF_UPDATE_FILES" true)
(cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
Expand Down