diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 264fad638389..f987a5c47951 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95ea8417ef57..f7322cf10e0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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