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

opencv3: use older cudatoolkit

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-10-16 04:25:18 +03:00
parent 22b582821d
commit 59f51eba29
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/opencv/3.x.nix
View File

@ -165,8 +165,10 @@ stdenv.mkDerivation rec {
(opencvFlag "OPENEXR" enableEXR) (opencvFlag "OPENEXR" enableEXR)
(opencvFlag "CUDA" enableCuda) (opencvFlag "CUDA" enableCuda)
(opencvFlag "CUBLAS" enableCuda) (opencvFlag "CUBLAS" enableCuda)
] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ] ] ++ lib.optionals enableCuda [
++ lib.optional buildContrib "-DBUILD_PROTOBUF=off" "-DCUDA_FAST_MATH=ON"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"
] ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off"
++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/all-packages.nix
View File

@ -10014,6 +10014,7 @@ with pkgs;
opencv3 = callPackage ../development/libraries/opencv/3.x.nix { opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
enableCuda = config.cudaSupport or false; enableCuda = config.cudaSupport or false;
cudatoolkit = cudatoolkit8;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit;
}; };