tjh.dev
opencv3: fix compilation with CUDA support
+8
-8
pkgs/development/libraries/opencv/3.x.nix
+8
-8
pkgs/development/libraries/opencv/3.x.nix
···
242
242
(opencvFlag "CUBLAS" enableCuda)
243
243
] ++ lib.optionals enableCuda [
244
244
"-DCUDA_FAST_MATH=ON"
245
-
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"
246
-
]
247
-
++ lib.optionals stdenv.isDarwin [
248
-
"-DWITH_OPENCL=OFF"
249
-
"-DWITH_LAPACK=OFF"
245
+
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
246
+
"-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
247
+
] ++ lib.optionals stdenv.isDarwin [
248
+
"-DWITH_OPENCL=OFF"
249
+
"-DWITH_LAPACK=OFF"
250
250
251
-
# On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build.
252
-
"-DBUILD_opencv_dnn_modern=OFF"
253
-
];
251
+
# On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build.
252
+
"-DBUILD_opencv_dnn_modern=OFF"
253
+
];
254
254
255
255
enableParallelBuilding = true;
256
256
-1
pkgs/top-level/all-packages.nix
-1
pkgs/top-level/all-packages.nix
···
10623
10623
10624
10624
opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
10625
10625
enableCuda = config.cudaSupport or false;
10626
-
cudatoolkit = cudatoolkit8;
10627
10626
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
10628
10627
};
10629
10628