From 504fb501bcabb8878d34736a1ebf578d9cbc89da Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 17 Mar 2023 10:32:28 -0400 Subject: magma: use cudaPackages.backendStdenv.cc instead of cudaPackages.cudatoolkit.cc --- pkgs/development/libraries/science/math/magma/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 52afc2fefefd3..aab8ca72a9751 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -35,7 +35,7 @@ let inherit (lib) lists strings trivial; - inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion; + inherit (cudaPackages) backendStdenv cudaFlags cudaVersion; inherit (magmaRelease) version hash supportedGpuTargets; # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements @@ -148,8 +148,8 @@ stdenv.mkDerivation { ] ++ lists.optionals cudaSupport [ "-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}" "-DMIN_ARCH=${minArch}" # Disarms magma's asserts - "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++" + "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" + "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" "-DMAGMA_ENABLE_CUDA=ON" ] ++ lists.optionals rocmSupport [ "-DCMAKE_C_COMPILER=${hip}/bin/hipcc" -- cgit 1.4.1