diff options
author | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 20:06:20 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 22:24:09 +0300 |
commit | a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f (patch) | |
tree | 5d5982fb2ed4f39e81f765dc8387a91d055a4369 /pkgs/development/libraries/opencv | |
parent | 8711763d429c0f8d4f09b5fc3901d5a5a35a3a9b (diff) | |
download | nixpkgs-a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f.tar nixpkgs-a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f.tar.gz nixpkgs-a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f.tar.bz2 nixpkgs-a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f.tar.lz nixpkgs-a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f.tar.xz nixpkgs-a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f.tar.zst nixpkgs-a10c91d5ae455be9d5f3ffa2efe8a5767cd8d10f.zip |
opencv3: fix compilation with CUDA support
Diffstat (limited to 'pkgs/development/libraries/opencv')
-rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index b5ee83ddfe8..51be387d75c 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -242,15 +242,15 @@ stdenv.mkDerivation rec { (opencvFlag "CUBLAS" enableCuda) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ] - ++ lib.optionals stdenv.isDarwin [ - "-DWITH_OPENCL=OFF" - "-DWITH_LAPACK=OFF" - - # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. - "-DBUILD_opencv_dnn_modern=OFF" - ]; + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_OPENCL=OFF" + "-DWITH_LAPACK=OFF" + + # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. + "-DBUILD_opencv_dnn_modern=OFF" + ]; enableParallelBuilding = true; |