gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #144157 from tpwrules/opencv_cuda_fix

Browse Source 
opencv{3,4}: move cudatoolkit to propagatedBuildInputs
This commit is contained in:
Ryan Burns
2021-11-03 23:12:22 -07:00
committed by GitHub
parent 2da7d605fd fbab2e0927
commit 7fe522a7b6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/opencv/3.x.nix
+2 -2
View File
@@ -213,11 +213,11 @@ stdenv.mkDerivation {
# tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
++ lib.optional enableCuda cudatoolkit;
nativeBuildInputs = [ cmake pkg-config unzip ];
pkgs/development/libraries/opencv/4.x.nix
+2 -2
View File
@@ -269,11 +269,11 @@ stdenv.mkDerivation {
# tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ]
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ];
nativeBuildInputs = [ cmake pkg-config unzip ];