diff options
author | Phillip Cloud <cloud@standard.ai> | 2021-01-10 08:09:36 -0500 |
---|---|---|
committer | Phillip Cloud <cloud@standard.ai> | 2021-01-10 08:54:38 -0500 |
commit | 8169d5c64451122b4867b5457a1d628354162fbe (patch) | |
tree | de8361c1d55dbd44204123443585ddbbbc7e2f49 | |
parent | f91f9eacd676ac5b54e8e2858bcbc0e3c39be9f4 (diff) |
nvidia-container-toolkit: pass nvidia-container-runtime into drv
-rw-r--r-- | pkgs/applications/virtualization/nvidia-container-toolkit/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index fd6edc64a0f6e..1ef9603195d0b 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -3,14 +3,8 @@ , buildGoModule , callPackage , makeWrapper -, containerRuntimePath -, configTemplate +, nvidia-container-runtime }: -let - nvidia-container-runtime = callPackage ../nvidia-container-runtime { - inherit containerRuntimePath configTemplate; - }; -in buildGoModule rec { pname = "nvidia-container-toolkit"; version = "1.3.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90cabd1f0374..ff32fe785933b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15416,15 +15416,17 @@ in nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: - symlinkJoin { + let + nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime { + inherit containerRuntimePath configTemplate; + }; + in symlinkJoin { name = "nvidia-containers-${name}"; paths = [ (callPackage ../applications/virtualization/libnvidia-container { }) - (callPackage ../applications/virtualization/nvidia-container-runtime { - inherit containerRuntimePath configTemplate; - }) + nvidia-container-runtime (callPackage ../applications/virtualization/nvidia-container-toolkit { - inherit containerRuntimePath configTemplate; + inherit nvidia-container-runtime; }) ] ++ additionalPaths; }; |