Merge pull request #314712 from ConnorBaker/fix/opencv3

opencv3: don't build with CUDA newer than 11
This commit is contained in:
Connor Baker
2024-05-27 14:11:12 -04:00
committed by GitHub
2 changed files with 5 additions and 1 deletions
+3 -1
View File
@@ -15,7 +15,7 @@
, enableContrib ? true
, enableCuda ? config.cudaSupport
, cudaPackages ? { }
, cudaPackages
, enableUnfree ? false
, enableIpp ? false
, enablePython ? false, pythonPackages ? null
@@ -295,6 +295,8 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = "https://opencv.org/";
# OpenCV 3 won't build with CUDA 12+
broken = enableCuda && cudaPackages.cudaAtLeast "12";
license = with licenses; if enableUnfree then unfree else bsd3;
maintainers = with maintainers; [mdaiter basvandijk];
platforms = with platforms; linux ++ darwin;
+2
View File
@@ -23627,6 +23627,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks)
AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate;
ffmpeg = ffmpeg_4;
# OpenCV3 won't build with anything newer than CUDA 11 due to API changes.
cudaPackages = cudaPackages_11;
};
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {