feat: use nvidia library list from apptainer

wi2trier · Dec 9, 2023 · 724a0a9 · 724a0a9
1 parent f5d1f40
commit 724a0a9
Showing 1 changed file with 12 additions and 34 deletions.
diff --git a/modules/systemd.nix b/modules/systemd.nix
@@ -12,36 +12,8 @@
       serviceConfig.Type = "oneshot";
     };
     link-cuda = let
-      # Regenerate with: nvidia-container-cli list --libraries
-      libraries = [
-        "libnvidia-ml.so"
-        "libnvidia-cfg.so"
-        "libcuda.so"
-        "libcudadebugger.so"
-        "libnvidia-opencl.so"
-        "libnvidia-gpucomp.so"
-        "libnvidia-ptxjitcompiler.so"
-        "libnvidia-allocator.so"
-        "libnvidia-pkcs11.so"
-        "libnvidia-pkcs11-openssl3.so"
-        "libnvidia-nvvm.so"
-        "libnvidia-ngx.so"
-        "libnvidia-encode.so"
-        "libnvidia-opticalflow.so"
-        "libnvcuvid.so"
-        "libnvidia-eglcore.so"
-        "libnvidia-glcore.so"
-        "libnvidia-tls.so"
-        "libnvidia-glsi.so"
-        "libnvidia-fbc.so"
-        "libnvidia-rtcore.so"
-        "libnvoptix.so"
-        "libGLX_nvidia.so"
-        "libEGL_nvidia.so"
-        "libGLESv2_nvidia.so"
-        "libGLESv1_CM_nvidia.so"
-        "libnvidia-glvkspirv.so"
-      ];
+      source = "/usr/lib/x86_64-linux-gnu";
+      target = "/run/opengl-driver/lib";
     in {
       enable = true;
       serviceConfig = {
@@ -50,10 +22,16 @@
       };
       wantedBy = ["system-manager.target"];
       script = ''
-        mkdir -p /run/opengl-driver/lib
-        rm -rf /run/opengl-driver/lib/*
-        # ln -s /usr/lib/x86_64-linux-gnu/lib*{cuda,nvidia}*.so.* /run/opengl-driver/lib
-        ${lib.concatLines (builtins.map (entry: "ln -s /usr/lib/x86_64-linux-gnu/${entry}.* /run/opengl-driver/lib") libraries)}
+        # Remove old links
+        ${lib.getExe' pkgs.coreutils "rm"} -rf ${target}
+        ${lib.getExe' pkgs.coreutils "mkdir"} -p ${target}
+        # Link all .so files specified in Apptainer
+        ${lib.getExe pkgs.gnugrep} '\.so$' ${pkgs.apptainer}/etc/apptainer/nvliblist.conf | while read file
+        do
+          ${lib.getExe' pkgs.coreutils "ln"} -s ${source}/$file.* ${target}
+        done
+        # Remove broken links
+        ${lib.getExe pkgs.findutils} -L ${target} -maxdepth 1 -type l -delete
       '';
     };
   };