diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-01-15 11:10:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 11:10:09 +0000 |
| commit | f3042e30785437f6cb2d99b15625b962fb96799f (patch) | |
| tree | 2abe2268516e82ee0355dcbcb35f8a2c72fe8ad8 /nixos/modules | |
| parent | 147270c1c938a416b1966a976ebe52f547cda43d (diff) | |
| parent | caf2a8d9eaa653a9989e14629198c515ba398ea9 (diff) | |
Merge pull request #108862 from cpcloud/refactor-nvidia-containers
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/virtualisation/docker.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/podman.nix | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 70d6fcc89674..f0ee2fe14608 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -213,9 +213,6 @@ in message = "Option enableNvidia requires 32bit support libraries"; }]; } - (mkIf cfg.enableNvidia { - environment.etc."nvidia-container-runtime/config.toml".source = "${pkgs.nvidia-docker}/etc/config.toml"; - }) ]); imports = [ diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 36c0ca8dfea3..98da5a096d91 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -2,7 +2,6 @@ let cfg = config.virtualisation.podman; toml = pkgs.formats.toml { }; - nvidia-docker = pkgs.nvidia-docker.override { containerRuntimePath = "${pkgs.runc}/bin/runc"; }; inherit (lib) mkOption types; @@ -100,8 +99,8 @@ in containersConf.extraConfig = lib.optionalString cfg.enableNvidia (builtins.readFile (toml.generate "podman.nvidia.containers.conf" { engine = { - conmon_env_vars = [ "PATH=${lib.makeBinPath [ nvidia-docker ]}" ]; - runtimes.nvidia = [ "${nvidia-docker}/bin/nvidia-container-runtime" ]; + conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; + runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; }; })); }; @@ -111,14 +110,7 @@ in assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; message = "Option dockerCompat conflicts with docker"; } - { - assertion = cfg.enableNvidia -> !config.virtualisation.docker.enableNvidia; - message = "Option enableNvidia conflicts with docker.enableNvidia"; - } ]; } - (lib.mkIf cfg.enableNvidia { - environment.etc."nvidia-container-runtime/config.toml".source = "${nvidia-docker}/etc/podman-config.toml"; - }) ]); } |