diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-08-15 07:55:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-08-15 07:55:47 +0200 |
| commit | bb945f3cea0f2d2fa2812381262fc90f6211730c (patch) | |
| tree | 03e3e5c6cb3a620a7b3af71e693c0634881430f5 /pkgs/development/libraries/opencv | |
| parent | 039c7dfa752ffea13dae9eba93a258a4577043e6 (diff) | |
| download | nixpkgs-bb945f3cea0f2d2fa2812381262fc90f6211730c.tar nixpkgs-bb945f3cea0f2d2fa2812381262fc90f6211730c.tar.gz nixpkgs-bb945f3cea0f2d2fa2812381262fc90f6211730c.tar.bz2 nixpkgs-bb945f3cea0f2d2fa2812381262fc90f6211730c.tar.lz nixpkgs-bb945f3cea0f2d2fa2812381262fc90f6211730c.tar.xz nixpkgs-bb945f3cea0f2d2fa2812381262fc90f6211730c.tar.zst nixpkgs-bb945f3cea0f2d2fa2812381262fc90f6211730c.zip | |
opencv(4), opencv3: switch to older protobuf
https://hydra.nixos.org/build/231540730 https://hydra.nixos.org/build/231464517
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 0188e5e1ae9..d295efe6fee 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, protobuf +, glog, boost, gflags, protobuf3_21 , config , enableJPEG ? true, libjpeg @@ -187,7 +187,7 @@ stdenv.mkDerivation { buildInputs = [ zlib pcre hdf5 glog boost gflags ] - ++ lib.optional useSystemProtobuf protobuf + ++ lib.optional useSystemProtobuf protobuf3_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 c82f0a0065b..2bc3954f8ab 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , hdf5 , boost , gflags -, protobuf +, protobuf3_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 protobuf ] + buildInputs = [ zlib pcre boost gflags protobuf3_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.protobuf}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=${printEnabled runAccuracyTests}" |