Merge pull request #314712 from ConnorBaker/fix/opencv3

opencv3: don't build with CUDA newer than 11

authored by

Connor Baker and committed by
GitHub
e7c35fd0 188d3767

+5 -1
+3 -1
pkgs/development/libraries/opencv/3.x.nix
··· 15 15 , enableContrib ? true 16 16 17 17 , enableCuda ? config.cudaSupport 18 - , cudaPackages ? { } 18 + , cudaPackages 19 19 , enableUnfree ? false 20 20 , enableIpp ? false 21 21 , enablePython ? false, pythonPackages ? null ··· 295 295 meta = with lib; { 296 296 description = "Open Computer Vision Library with more than 500 algorithms"; 297 297 homepage = "https://opencv.org/"; 298 + # OpenCV 3 won't build with CUDA 12+ 299 + broken = enableCuda && cudaPackages.cudaAtLeast "12"; 298 300 license = with licenses; if enableUnfree then unfree else bsd3; 299 301 maintainers = with maintainers; [mdaiter basvandijk]; 300 302 platforms = with platforms; linux ++ darwin;
+2
pkgs/top-level/all-packages.nix
··· 23627 23627 inherit (darwin.apple_sdk.frameworks) 23628 23628 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; 23629 23629 ffmpeg = ffmpeg_4; 23630 + # OpenCV3 won't build with anything newer than CUDA 11 due to API changes. 23631 + cudaPackages = cudaPackages_11; 23630 23632 }; 23631 23633 23632 23634 opencv4 = callPackage ../development/libraries/opencv/4.x.nix {