diff options
| author | Thomas <twatson52@icloud.com> | 2021-11-01 16:30:07 -0500 |
|---|---|---|
| committer | Thomas <twatson52@icloud.com> | 2021-11-01 16:34:18 -0500 |
| commit | fbab2e0927e47def6a6b1084158ebb4b64dcde39 (patch) | |
| tree | 4fc7a4e3034ea27f10f5b4cb7edbf4be2cd29f5b /pkgs/development/libraries/opencv | |
| parent | b5626d1c78cc68331c867f94c81b9a4f67f2ce24 (diff) | |
| download | nixpkgs-fbab2e0927e47def6a6b1084158ebb4b64dcde39.tar nixpkgs-fbab2e0927e47def6a6b1084158ebb4b64dcde39.tar.gz nixpkgs-fbab2e0927e47def6a6b1084158ebb4b64dcde39.tar.bz2 nixpkgs-fbab2e0927e47def6a6b1084158ebb4b64dcde39.tar.lz nixpkgs-fbab2e0927e47def6a6b1084158ebb4b64dcde39.tar.xz nixpkgs-fbab2e0927e47def6a6b1084158ebb4b64dcde39.tar.zst nixpkgs-fbab2e0927e47def6a6b1084158ebb4b64dcde39.zip | |
opencv{3,4}: move cudatoolkit to propagatedBuildInputs
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index dfb67b6a12a..00c595d1d2d 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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 ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 548b0df096b..10459d959b2 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -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 ]; |