opencv4: remove old Darwin cruft, use SDK 14

Same issue as Qt5.
This commit is contained in:
K900
2025-04-10 17:17:20 +03:00
parent 6b77ed4b18
commit 12f58047cd
2 changed files with 2 additions and 24 deletions
+2 -16
View File
@@ -87,13 +87,8 @@
# An empty lists means this setting is omitted which matches upstreams default.
enabledModules ? [ ],
AVFoundation,
Cocoa,
VideoDecodeAcceleration,
CoreMedia,
MediaToolbox,
Accelerate,
bzip2,
apple-sdk_14, # earlier SDKs cause linking issues on x86_64
callPackage,
}@inputs:
@@ -383,10 +378,6 @@ effectiveStdenv.mkDerivation {
++ optionals enableFfmpeg [
ffmpeg
]
++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [
bzip2
VideoDecodeAcceleration
]
++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
elfutils
gst_all_1.gst-plugins-base
@@ -426,12 +417,7 @@ effectiveStdenv.mkDerivation {
]
++ optionals effectiveStdenv.hostPlatform.isDarwin [
bzip2
AVFoundation
Cocoa
VideoDecodeAcceleration
CoreMedia
MediaToolbox
Accelerate
apple-sdk_14
]
++ optionals enableDocs [
doxygen
-8
View File
@@ -10768,14 +10768,6 @@ with pkgs;
};
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin.apple_sdk.frameworks)
AVFoundation
Cocoa
VideoDecodeAcceleration
CoreMedia
MediaToolbox
Accelerate
;
pythonPackages = python3Packages;
# TODO: LTO does not work.
# https://github.com/NixOS/nixpkgs/issues/343123