pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #144157 from tpwrules/opencv_cuda_fix

opencv{3,4}: move cudatoolkit to propagatedBuildInputs

authored by

Ryan Burns and committed by
GitHub 7fe522a7 2da7d605

+4 -4
unified split
+2 -2
pkgs/development/libraries/opencv/3.x.nix
··· 213 # tesseract & leptonica. 214 ++ lib.optionals enableTesseract [ tesseract leptonica ] 215 ++ lib.optional enableTbb tbb 216 - ++ lib.optional enableCuda cudatoolkit 217 ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] 218 ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; 219 220 - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; 221 222 nativeBuildInputs = [ cmake pkg-config unzip ]; 223
··· 213 # tesseract & leptonica. 214 ++ lib.optionals enableTesseract [ tesseract leptonica ] 215 ++ lib.optional enableTbb tbb 216 ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] 217 ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; 218 219 + propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy 220 + ++ lib.optional enableCuda cudatoolkit; 221 222 nativeBuildInputs = [ cmake pkg-config unzip ]; 223
+2 -2
pkgs/development/libraries/opencv/4.x.nix
··· 269 # tesseract & leptonica. 270 ++ lib.optionals enableTesseract [ tesseract leptonica ] 271 ++ lib.optional enableTbb tbb 272 - ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ] 273 ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] 274 ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; 275 276 - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; 277 278 nativeBuildInputs = [ cmake pkg-config unzip ]; 279
··· 269 # tesseract & leptonica. 270 ++ lib.optionals enableTesseract [ tesseract leptonica ] 271 ++ lib.optional enableTbb tbb 272 ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] 273 ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; 274 275 + propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy 276 + ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ]; 277 278 nativeBuildInputs = [ cmake pkg-config unzip ]; 279