mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 04:57:56 +03:00
Merge pull request #256444 from delroth/opencv-darwin-unvendor
opencv3,opencv4: disable some unnecessary vendoring on Darwin
This commit is contained in:
commit
5266b96d2e
@ -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 [
|
||||
|
@ -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 [
|
||||
|
Loading…
Reference in New Issue
Block a user