From e86e43b074841c05d217f44dfa58e41a569895d5 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Wed, 8 Jul 2026 19:49:02 -0400 Subject: [PATCH] terra: remove cudatoolkit Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/te/terra/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/terra/package.nix b/pkgs/by-name/te/terra/package.nix index c41332c7ad03..48c3242c1884 100644 --- a/pkgs/by-name/te/terra/package.nix +++ b/pkgs/by-name/te/terra/package.nix @@ -1,4 +1,5 @@ { + config, lib, stdenv, fetchFromGitHub, @@ -8,7 +9,7 @@ libxml2, symlinkJoin, cudaPackages, - enableCUDA ? false, + enableCUDA ? config.cudaSupport, libffi, libpfm, }: @@ -37,8 +38,6 @@ let ]; }; - cuda = cudaPackages.cudatoolkit; - clangVersion = llvmPackages.clang-unwrapped.version; in @@ -60,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { libffi libxml2 ] - ++ lib.optionals enableCUDA [ cuda ] + ++ lib.optionals enableCUDA (with cudaPackages; [ + cuda_nvcc + cuda_cudart + ]) ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm; cmakeFlags =