diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-09 08:17:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-09 08:21:09 +0200 |
| commit | e4d2b6fced30ac3ba14abd7b0b2471050d496a5d (patch) | |
| tree | fedf597d1b5108c4fc474b8222f5fae97692a70a /pkgs/development/libraries/opencv | |
| parent | fc0616b73d61c71eae7159dc43fdd957ae98480d (diff) | |
| download | nixpkgs-e4d2b6fced30ac3ba14abd7b0b2471050d496a5d.tar nixpkgs-e4d2b6fced30ac3ba14abd7b0b2471050d496a5d.tar.gz nixpkgs-e4d2b6fced30ac3ba14abd7b0b2471050d496a5d.tar.bz2 nixpkgs-e4d2b6fced30ac3ba14abd7b0b2471050d496a5d.tar.lz nixpkgs-e4d2b6fced30ac3ba14abd7b0b2471050d496a5d.tar.xz nixpkgs-e4d2b6fced30ac3ba14abd7b0b2471050d496a5d.tar.zst nixpkgs-e4d2b6fced30ac3ba14abd7b0b2471050d496a5d.zip | |
opencv_{3,4}: add Accelerate framework on darwin
No idea why aarch64-darwin started to need it now. https://hydra.nixos.org/build/215252174#tabs-buildsteps (also split long lines)
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 45d55542c82..40614f489b5 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -32,7 +32,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2, CoreMedia, MediaToolbox +, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2, CoreMedia, MediaToolbox, Accelerate }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -211,7 +211,9 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] + ++ lib.optionals stdenv.isDarwin [ + bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate + ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 496412dda32..5f994884861 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -79,6 +79,7 @@ , VideoDecodeAcceleration , CoreMedia , MediaToolbox +, Accelerate , bzip2 , callPackage }: @@ -326,7 +327,9 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] + ++ lib.optionals stdenv.isDarwin [ + bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate + ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ] ++ lib.optionals enableCuda [ cuda-redist ]; |