diff --git a/nix-builder/lib/extension/torch/arch.nix b/nix-builder/lib/extension/torch/arch.nix index f9f5955e..d2c3c82e 100644 --- a/nix-builder/lib/extension/torch/arch.nix +++ b/nix-builder/lib/extension/torch/arch.nix @@ -244,17 +244,16 @@ stdenv.mkDerivation (prevAttrs: { ] ++ extraDeps; - env = - { - inherit variant; - } - // lib.optionalAttrs cudaSupport { - CUDAToolkit_ROOT = "${lib.getDev cudaPackages.cuda_nvcc}"; - } - // lib.optionalAttrs xpuSupport { - MKLROOT = oneapi-torch-dev; - SYCL_ROOT = oneapi-torch-dev; - }; + env = { + inherit variant; + } + // lib.optionalAttrs cudaSupport { + CUDAToolkit_ROOT = "${lib.getDev cudaPackages.cuda_nvcc}"; + } + // lib.optionalAttrs xpuSupport { + MKLROOT = oneapi-torch-dev; + SYCL_ROOT = oneapi-torch-dev; + }; # If we use the default setup, CMAKE_CUDA_HOST_COMPILER gets set to nixpkgs g++. dontSetupCUDAToolkitCompilers = true; diff --git a/nix-builder/lib/extension/tvm-ffi/arch.nix b/nix-builder/lib/extension/tvm-ffi/arch.nix index de5a58dd..c4b39c6a 100644 --- a/nix-builder/lib/extension/tvm-ffi/arch.nix +++ b/nix-builder/lib/extension/tvm-ffi/arch.nix @@ -236,17 +236,16 @@ stdenv.mkDerivation (prevAttrs: { ] ++ extraDeps; - env = - { - inherit variant; - } - // lib.optionalAttrs cudaSupport { - CUDAToolkit_ROOT = "${lib.getDev cudaPackages.cuda_nvcc}"; - } - // lib.optionalAttrs xpuSupport { - MKLROOT = oneapi-torch-dev; - SYCL_ROOT = oneapi-torch-dev; - }; + env = { + inherit variant; + } + // lib.optionalAttrs cudaSupport { + CUDAToolkit_ROOT = "${lib.getDev cudaPackages.cuda_nvcc}"; + } + // lib.optionalAttrs xpuSupport { + MKLROOT = oneapi-torch-dev; + SYCL_ROOT = oneapi-torch-dev; + }; # If we use the default setup, CMAKE_CUDA_HOST_COMPILER gets set to nixpkgs g++. dontSetupCUDAToolkitCompilers = true;