From c6b639ec352cf9b4d7e0067be76e6ec4645c4c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Apr 2023 08:23:17 +0200 Subject: [PATCH] opencv2: add Accelerate framework on darwin Same as commit e4d2b6fced3; I didn't notice this version suffered from it as well. It's probably random/impurity anyway. https://hydra.nixos.org/build/214981496 --- pkgs/development/libraries/opencv/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 46ffdf11f88b..06cc02c47c94 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -9,7 +9,7 @@ , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , enableUnfree ? false -, AVFoundation, Cocoa, QTKit +, AVFoundation, Cocoa, QTKit, Accelerate }: let @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen - ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ] + ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit Accelerate ] ; nativeBuildInputs = [ cmake pkg-config unzip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3450be9b0e17..66020ad11d1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22871,7 +22871,7 @@ with pkgs; openct = callPackage ../development/libraries/openct { }; opencv2 = callPackage ../development/libraries/opencv { - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit Accelerate; ffmpeg = ffmpeg_4; };