nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

opencv3: use older cudatoolkit

Browse Source 
(cherry picked from commit 59f51eba29)
This commit is contained in:
Nikolay Amiantov
2017-10-16 04:25:18 +03:00
committed by Roel van Dijk
parent 0f5464fb91
commit a370a4e6db
2 changed files with 5 additions and 2 deletions
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 "CUDA" enableCuda)
(opencvFlag "CUBLAS" enableCuda)
] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]
++ lib.optional buildContrib "-DBUILD_PROTOBUF=off"
] ++ lib.optionals enableCuda [
"-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"];
enableParallelBuilding = true;

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

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