Unverified Commit 3f119f80 authored by Rafael Fernández López's avatar Rafael Fernández López
Browse files

nvidia-container-toolkit: assert nvidia driver is present 

Also, do not add the `nvidia` driver to `videoDrivers` automatically;
assert it is present (or the datacenter one) instead.
parent 1bdef915

nixos/modules/services/hardware/nvidia-container-toolkit/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ 
  };



  config = lib.mkIf config.hardware.nvidia-container-toolkit.enable {

    assertions = [

      { assertion = config.hardware.nvidia.datacenter.enable || lib.elem "nvidia" config.services.xserver.videoDrivers;

        message = ''`nvidia-container-toolkit` requires nvidia datacenter or desktop drivers: set `hardware.nvidia.datacenter.enable` or add "nvidia" to `services.xserver.videoDrivers`'';

      }];



    virtualisation.docker = {

      daemon.settings = lib.mkIf

        (lib.versionAtLeast config.virtualisation.docker.package.version "25") {
@@ -130,9 +135,6 @@ 
      ]);

    };



    services.xserver.videoDrivers = lib.mkIf

      (!config.hardware.nvidia.datacenter.enable) [ "nvidia" ];



    systemd.services.nvidia-container-toolkit-cdi-generator = {

      description = "Container Device Interface (CDI) for Nvidia generator";

      wantedBy = [ "multi-user.target" ];