magma: fix build on CUDA 11.8 (#384554)

prusnak · web-flow · commit 020398ba9596 · 2025-02-23T18:42:58.000+01:00
diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix
@@ -160,6 +160,7 @@ stdenv.mkDerivation {
     ++ lists.optionals cudaSupport (
       with effectiveCudaPackages;
       [
+        cuda_cccl # <nv/target> and <cuda/std/type_traits>
         cuda_cudart # cuda_runtime.h
         libcublas # cublas_v2.h
         libcusparse # cusparse.h
@@ -170,9 +171,6 @@ stdenv.mkDerivation {
       ++ lists.optionals (cudaAtLeast "11.8") [
         cuda_profiler_api # <cuda_profiler_api.h>
       ]
-      ++ lists.optionals (cudaAtLeast "12.0") [
-        cuda_cccl # <nv/target>
-      ]
     )
     ++ lists.optionals rocmSupport (
       with effectiveRocmPackages;

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ stdenv.mkDerivation {`
`160`	`160`	`++ lists.optionals cudaSupport (`
`161`	`161`	`with effectiveCudaPackages;`
`162`	`162`	`[`
	`163`	`+ cuda_cccl # <nv/target> and <cuda/std/type_traits>`
`163`	`164`	`cuda_cudart # cuda_runtime.h`
`164`	`165`	`libcublas # cublas_v2.h`
`165`	`166`	`libcusparse # cusparse.h`
`@@ -170,9 +171,6 @@ stdenv.mkDerivation {`
`170`	`171`	`++ lists.optionals (cudaAtLeast "11.8") [`
`171`	`172`	`cuda_profiler_api # <cuda_profiler_api.h>`
`172`	`173`	`]`
`173`		`- ++ lists.optionals (cudaAtLeast "12.0") [`
`174`		`- cuda_cccl # <nv/target>`
`175`		`- ]`
`176`	`174`	`)`
`177`	`175`	`++ lists.optionals rocmSupport (`
`178`	`176`	`with effectiveRocmPackages;`