From eb59699fbb5ba7bef81004ae35bbc7136207d791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Tue, 23 Apr 2024 19:43:03 +0200
Subject: [PATCH] hardware/nvidia-container-toolkit: enable CDI on
 `virtualisation.docker.daemon.settings`

---
 .../services/hardware/nvidia-container-toolkit/default.nix  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
index 7b4973d3c6b0..6c6bc667e649 100644
--- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
+++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
@@ -66,6 +66,12 @@
 
   config = {
 
+    virtualisation.docker.daemon.settings = lib.mkIf
+      (config.hardware.nvidia-container-toolkit.enable &&
+       (lib.versionAtLeast config.virtualisation.docker.package.version "25")) {
+      features.cdi = true;
+    };
+
     hardware.nvidia-container-toolkit.mounts = let
       nvidia-driver = config.hardware.nvidia.package;
     in (lib.mkMerge [