b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

opencv_{3,4}: add Accelerate framework on darwin

Browse source 
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:
Vladimír Čunát 2023-04-09 08:17:48 +02:00
parent fc0616b73d
commit e4d2b6fced
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/opencv/3.x.nix
View file

@ -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

5
pkgs/development/libraries/opencv/4.x.nix
View file

@ -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 ];

6
pkgs/top-level/all-packages.nix
View file

@ -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;
};