nixos/nvidia-container-toolkit: add extraArgs option (#423934)

authored by Connor Baker and committed by GitHub 8ca06ce1 bc8e1ed9

+12 -11
+3 -11
nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
··· 10 nvidia-driver, 11 runtimeShell, 12 writeScriptBin, 13 }: 14 let 15 - mkMount = 16 - { 17 - hostPath, 18 - containerPath, 19 - mountOptions, 20 - }: 21 - { 22 - inherit hostPath containerPath; 23 - options = mountOptions; 24 - }; 25 mountToCommand = 26 mount: 27 "additionalMount \"${mount.hostPath}\" \"${mount.containerPath}\" '${builtins.toJSON mount.mountOptions}'"; ··· 48 --device-name-strategy ${device-name-strategy} \ 49 --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ 50 --library-search-path ${lib.getLib nvidia-driver}/lib \ 51 - --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} 52 } 53 54 function additionalMount {
··· 10 nvidia-driver, 11 runtimeShell, 12 writeScriptBin, 13 + extraArgs, 14 }: 15 let 16 mountToCommand = 17 mount: 18 "additionalMount \"${mount.hostPath}\" \"${mount.containerPath}\" '${builtins.toJSON mount.mountOptions}'"; ··· 39 --device-name-strategy ${device-name-strategy} \ 40 --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ 41 --library-search-path ${lib.getLib nvidia-driver}/lib \ 42 + --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} \ 43 + ${lib.escapeShellArgs extraArgs} 44 } 45 46 function additionalMount {
+9
nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
··· 120 }; 121 122 package = lib.mkPackageOption pkgs "nvidia-container-toolkit" { }; 123 }; 124 125 }; ··· 241 device-name-strategy 242 discovery-mode 243 mounts 244 ; 245 nvidia-container-toolkit = config.hardware.nvidia-container-toolkit.package; 246 nvidia-driver = config.hardware.nvidia.package;
··· 120 }; 121 122 package = lib.mkPackageOption pkgs "nvidia-container-toolkit" { }; 123 + 124 + extraArgs = lib.mkOption { 125 + type = lib.types.listOf lib.types.str; 126 + default = [ ]; 127 + description = '' 128 + Extra arguments to be passed to nvidia-ctk. 129 + ''; 130 + }; 131 }; 132 133 }; ··· 249 device-name-strategy 250 discovery-mode 251 mounts 252 + extraArgs 253 ; 254 nvidia-container-toolkit = config.hardware.nvidia-container-toolkit.package; 255 nvidia-driver = config.hardware.nvidia.package;