Merge pull request #219928 from elohmeier/opencv2-darwin
opencv2: fix build on Darwin
This commit is contained in:
commit
ff951cd1c2
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue