about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorSerge K <newkozlukov@gmail.com>2022-04-19 21:52:52 +0300
committerGitHub <noreply@github.com>2022-04-19 20:52:52 +0200
commitd924de58be179e38ce352171055c2832c3ca4d97 (patch)
tree8c5fddbb67a20d69b8afcc4a2e7529ab487d058e /pkgs/games
parent047473aa32471086d42177c3b70c573ea1b748db (diff)
cudaPackages.cudnn: migrate to redist cuda, fix missing zlib (#168748)
* cudaPackages.cudnn: migrate to redist cudaPackages

* cudaPackages.cudnn: fix missing zlib in rpath

* cudaPackages.cudnn: remove the propagated cudatoolkit

* cudaPackages.cudnn: use autoPatchelfHook

instead of custom find ... -exec ldd | grep routine
mark libcudnn_cnn_infer.so as needed for libcudnn.so on cudnn>=8.0.5
- a hint for autoPatchelf, as an alternative to manually adding $ORIGIN

* cudaPackages.cudnn: use automatic hooks for rpath

as a more common way to use addOpenGLRunpath and autoPatchelf with cudaPackages

* cudaPackages.cudnn: consume individual cuda packages

...since cudnn is part of the cuda package set

- introduces the scary useCudatoolkitRunfile function argument
  to discourage usage of the runfile-based cudatoolkit
- instead of the rather hidden useRedist term in let ... in
- repeats cudatoolkit_root pattern after cuda_joined in pytorch &c
  (the "toolchain view")
- redist packages are marked optional to support cuda<11.4 where the
  attributes for redist packages do not exist

* cudaPackages.cudnn: update to pname+version

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/katago/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix
index 6328b3f9bc820..a3d7ed5cba9df 100644
--- a/pkgs/games/katago/default.nix
+++ b/pkgs/games/katago/default.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
     eigen
   ] ++ lib.optionals (enableGPU && enableCuda) [
     cudaPackages.cudnn
+    cudaPackages.cudatoolkit
     mesa.drivers
   ] ++ lib.optionals (enableGPU && !enableCuda) [
     opencl-headers