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)
This commit is contained in:
parent
fc0616b73d
commit
e4d2b6fced
|
@ -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
|
||||
|
|
|
@ -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 ];
|
||||
|
||||
|
|
|
@ -22872,7 +22872,8 @@ with pkgs;
|
|||
};
|
||||
|
||||
opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate;
|
||||
ffmpeg = ffmpeg_4;
|
||||
};
|
||||
|
||||
|
@ -22881,7 +22882,8 @@ with pkgs;
|
|||
};
|
||||
|
||||
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate;
|
||||
pythonPackages = python3Packages;
|
||||
ffmpeg = ffmpeg_4;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue