diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2023-09-27 23:23:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 23:23:45 +0200 |
| commit | 5266b96d2ea595b56d9fb18f272ced93ceaac313 (patch) | |
| tree | f4cf3a82eb05d2d6d1e1ced014af8a159f09d6e6 /pkgs/development/libraries/opencv | |
| parent | 191393e7f5c95d78b0c1fb607ab38b3d18df881e (diff) | |
| parent | c32c0dd64a3277256dee95c29fec770c2c3ad3c8 (diff) | |
| download | nixpkgs-5266b96d2ea595b56d9fb18f272ced93ceaac313.tar nixpkgs-5266b96d2ea595b56d9fb18f272ced93ceaac313.tar.gz nixpkgs-5266b96d2ea595b56d9fb18f272ced93ceaac313.tar.bz2 nixpkgs-5266b96d2ea595b56d9fb18f272ced93ceaac313.tar.lz nixpkgs-5266b96d2ea595b56d9fb18f272ced93ceaac313.tar.xz nixpkgs-5266b96d2ea595b56d9fb18f272ced93ceaac313.tar.zst nixpkgs-5266b96d2ea595b56d9fb18f272ced93ceaac313.zip | |
Merge pull request #256444 from delroth/opencv-darwin-unvendor
opencv3,opencv4: disable some unnecessary vendoring on Darwin
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 8774c97de3b..037192d871e 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -250,6 +250,16 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + + # Disable unnecessary vendoring that's enabled by default only for Darwin. + # Note that the opencvFlag feature flags listed above still take + # precedence, so we can safely list everything here. + "-DBUILD_ZLIB=OFF" + "-DBUILD_TIFF=OFF" + "-DBUILD_JASPER=OFF" + "-DBUILD_JPEG=OFF" + "-DBUILD_PNG=OFF" + "-DBUILD_WEBP=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ] ++ lib.optionals enableEigen [ diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 2bc3954f8ab..68099a57c63 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -424,6 +424,17 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + + # Disable unnecessary vendoring that's enabled by default only for Darwin. + # Note that the opencvFlag feature flags listed above still take + # precedence, so we can safely list everything here. + "-DBUILD_ZLIB=OFF" + "-DBUILD_TIFF=OFF" + "-DBUILD_OPENJPEG=OFF" + "-DBUILD_JASPER=OFF" + "-DBUILD_JPEG=OFF" + "-DBUILD_PNG=OFF" + "-DBUILD_WEBP=OFF" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ |