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 10 nvidia-driver, 11 11 runtimeShell, 12 12 writeScriptBin, 13 + extraArgs, 13 14 }: 14 15 let 15 - mkMount = 16 - { 17 - hostPath, 18 - containerPath, 19 - mountOptions, 20 - }: 21 - { 22 - inherit hostPath containerPath; 23 - options = mountOptions; 24 - }; 25 16 mountToCommand = 26 17 mount: 27 18 "additionalMount \"${mount.hostPath}\" \"${mount.containerPath}\" '${builtins.toJSON mount.mountOptions}'"; ··· 48 39 --device-name-strategy ${device-name-strategy} \ 49 40 --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ 50 41 --library-search-path ${lib.getLib nvidia-driver}/lib \ 51 - --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} 42 + --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} \ 43 + ${lib.escapeShellArgs extraArgs} 52 44 } 53 45 54 46 function additionalMount {
+9
nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
··· 120 120 }; 121 121 122 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 + }; 123 131 }; 124 132 125 133 }; ··· 241 249 device-name-strategy 242 250 discovery-mode 243 251 mounts 252 + extraArgs 244 253 ; 245 254 nvidia-container-toolkit = config.hardware.nvidia-container-toolkit.package; 246 255 nvidia-driver = config.hardware.nvidia.package;