nvidia-docker/nvidia-podman: inherit name directly

This commit is contained in:
Phillip Cloud 2021-01-10 08:54:18 -05:00
parent 4cd4468144
commit caf2a8d9ea

View File

@ -15421,7 +15421,7 @@ in
inherit containerRuntimePath configTemplate; inherit containerRuntimePath configTemplate;
}; };
in symlinkJoin { in symlinkJoin {
name = "nvidia-containers-${name}"; inherit name;
paths = [ paths = [
(callPackage ../applications/virtualization/libnvidia-container { }) (callPackage ../applications/virtualization/libnvidia-container { })
nvidia-container-runtime nvidia-container-runtime
@ -15432,14 +15432,14 @@ in
}; };
nvidia-docker = mkNvidiaContainerPkg { nvidia-docker = mkNvidiaContainerPkg {
name = "docker"; name = "nvidia-docker";
containerRuntimePath = "${docker}/libexec/docker/runc"; containerRuntimePath = "${docker}/libexec/docker/runc";
configTemplate = ../applications/virtualization/nvidia-docker/config.toml; configTemplate = ../applications/virtualization/nvidia-docker/config.toml;
additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ]; additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ];
}; };
nvidia-podman = mkNvidiaContainerPkg { nvidia-podman = mkNvidiaContainerPkg {
name = "podman"; name = "nvidia-podman";
containerRuntimePath = "${runc}/bin/runc"; containerRuntimePath = "${runc}/bin/runc";
configTemplate = ../applications/virtualization/nvidia-podman/config.toml; configTemplate = ../applications/virtualization/nvidia-podman/config.toml;
}; };