nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #314712 from ConnorBaker/fix/opencv3

Browse Source 
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
commit e7c35fd0d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opencv/3.x.nix
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
pkgs/top-level/all-packages.nix
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 {