about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorMarkus Kowalewski <markus.kowalewski@gmail.com>2023-12-26 13:57:49 +0100
committerMarkus Kowalewski <markus.kowalewski@gmail.com>2023-12-26 14:03:27 +0100
commit43d728ff882cb1baca572d98f05d8727d3bb228a (patch)
treefbb19d452c6587a232e9ec3d96bf9eaffd6efdb5 /pkgs/development/libraries
parente785198679acb94537c17e22f34b500c64e59b6c (diff)
elpa: fix CUDA build, use cudaPackages instead of cudatoolkit
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/elpa/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix
index 0967ba113f8d8..88e9df17c0ca0 100644
--- a/pkgs/development/libraries/elpa/default.nix
+++ b/pkgs/development/libraries/elpa/default.nix
@@ -11,7 +11,7 @@
 , enableCuda ? config.cudaSupport
 # type of GPU architecture
 , nvidiaArch ? "sm_60"
-, cudatoolkit
+, cudaPackages
 } :
 
 assert blas.isILP64 == lapack.isILP64;
@@ -43,10 +43,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" "man" "dev" ];
 
-  nativeBuildInputs = [ autoreconfHook perl ];
+  nativeBuildInputs = [ autoreconfHook perl ]
+    ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
 
   buildInputs = [ mpi blas lapack scalapack ]
-    ++ lib.optional enableCuda cudatoolkit;
+    ++ lib.optionals enableCuda [
+      cudaPackages.cuda_cudart
+      cudaPackages.libcublas
+    ];
 
   preConfigure = ''
     export FC="mpifort"