nvidia-container-toolkit: pass nvidia-container-runtime into drv

This commit is contained in:
Phillip Cloud 2021-01-10 08:09:36 -05:00
parent f91f9eacd6
commit 8169d5c644
2 changed files with 8 additions and 12 deletions

View File

@ -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";

View File

@ -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;
};