monado: do not use cudatoolkit, use cuda_nvcc+cuda_cudart (#436847)
This commit is contained in:
@@ -60,13 +60,15 @@ stdenv.mkDerivation {
|
||||
opencv.cxxdev
|
||||
tbb
|
||||
xorg.libX11
|
||||
]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BASALT_INSTANTIATIONS_DOUBLE" false)
|
||||
(lib.cmakeBool "BUILD_TESTS" false)
|
||||
(lib.cmakeFeature "EIGEN_ROOT" "${eigen}/include/eigen3")
|
||||
(lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -143,6 +143,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals tracingSupport [
|
||||
tracy
|
||||
]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_nvcc
|
||||
cudaPackages.cuda_cudart
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -151,7 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "XRT_FEATURE_TRACING" tracingSupport)
|
||||
(lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true)
|
||||
(lib.cmakeBool "XRT_HAVE_STEAM" true)
|
||||
(lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
|
||||
];
|
||||
|
||||
# Help openxr-loader find this runtime
|
||||
|
||||
Reference in New Issue
Block a user