diff options
| author | Aaron Jheng <wentworth@outlook.com> | 2023-10-06 03:27:27 +0000 |
|---|---|---|
| committer | Aaron Jheng <wentworth@outlook.com> | 2023-10-11 13:20:31 +0000 |
| commit | 80aaa46d4c7d6f121a4fb9879a8e41c536186c8a (patch) | |
| tree | d306932e174e3461214b93d76315afb913d1c62a /pkgs/development/libraries/opencv | |
| parent | ee14e5df159199e807a5a3ddaebff0366b5aae84 (diff) | |
| download | nixpkgs-80aaa46d4c7d6f121a4fb9879a8e41c536186c8a.tar nixpkgs-80aaa46d4c7d6f121a4fb9879a8e41c536186c8a.tar.gz nixpkgs-80aaa46d4c7d6f121a4fb9879a8e41c536186c8a.tar.bz2 nixpkgs-80aaa46d4c7d6f121a4fb9879a8e41c536186c8a.tar.lz nixpkgs-80aaa46d4c7d6f121a4fb9879a8e41c536186c8a.tar.xz nixpkgs-80aaa46d4c7d6f121a4fb9879a8e41c536186c8a.tar.zst nixpkgs-80aaa46d4c7d6f121a4fb9879a8e41c536186c8a.zip | |
protobuf: use new package definition only
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 037192d871e..7e928a98c53 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , cmake, pkg-config, unzip, zlib, pcre, hdf5 -, glog, boost, gflags, protobuf3_21 +, glog, boost, gflags, protobuf_21 , config , enableJPEG ? true, libjpeg @@ -186,7 +186,7 @@ stdenv.mkDerivation { buildInputs = [ zlib pcre hdf5 glog boost gflags ] - ++ lib.optional useSystemProtobuf protobuf3_21 + ++ lib.optional useSystemProtobuf protobuf_21 ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 68099a57c63..6268a2c02e5 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , hdf5 , boost , gflags -, protobuf3_21 +, protobuf_21 , config , ocl-icd , buildPackages @@ -317,7 +317,7 @@ stdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf3_21 ] + buildInputs = [ zlib pcre boost gflags protobuf_21 ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 @@ -369,7 +369,7 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=${printEnabled runAccuracyTests}" |