From a7575e30dfc923804ff534ac436c6c638710dba1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 25 Aug 2025 20:56:48 +0200 Subject: [PATCH 1/2] basalt-monado: do not use cudatoolkit, use cuda_nvcc --- pkgs/by-name/ba/basalt-monado/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index ee2294f50879..3a1acbf76abc 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -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 { }; From 1546f04d1e9f7fd7107c23c6bc3012044e5ff9da Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 25 Aug 2025 20:57:09 +0200 Subject: [PATCH 2/2] monado: do not use cudatoolkit, use cuda_nvcc+cuda_cudart --- pkgs/by-name/mo/monado/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index aff6ab89d4c5..5cc46c2ac552 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -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