summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-03-07 09:13:01 +0200
committerGitHub <noreply@github.com>2023-03-07 09:13:01 +0200
commitff951cd1c2fc8e639814b88ba2a2d9358916b03d (patch)
tree7c09de2a0ecd6b6966d849a85707bf5282d9d5a6
parentc2aa8ebfaea30751f42781f25a5b0c574ea6438d (diff)
parent649670296e729ac4a9c6667fcb172ae24a939ff2 (diff)
Merge pull request #219928 from elohmeier/opencv2-darwin
opencv2: fix build on Darwin
-rw-r--r--pkgs/development/libraries/opencv/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 059dc69df120..46ffdf11f88b 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
-, Cocoa, QTKit
+, AVFoundation, Cocoa, QTKit
}:
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 [ Cocoa QTKit ]
+ ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]
;
nativeBuildInputs = [ cmake pkg-config unzip ];
@@ -79,6 +79,6 @@ stdenv.mkDerivation rec {
homepage = "https://opencv.org/";
license = if enableUnfree then licenses.unfree else licenses.bsd3;
maintainers = with maintainers; [ ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d7fa20a7195..765682bcc040 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22706,7 +22706,7 @@ with pkgs;
openct = callPackage ../development/libraries/openct { };
opencv2 = callPackage ../development/libraries/opencv {
- inherit (darwin.apple_sdk.frameworks) Cocoa QTKit;
+ inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit;
ffmpeg = ffmpeg_4;
};