JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
View File

@ -3,14 +3,8 @@
, buildGoModule , buildGoModule
, callPackage , callPackage
, makeWrapper , makeWrapper
, containerRuntimePath , nvidia-container-runtime
, configTemplate
}: }:
let
nvidia-container-runtime = callPackage ../nvidia-container-runtime {
inherit containerRuntimePath configTemplate;
};
in
buildGoModule rec { buildGoModule rec {
pname = "nvidia-container-toolkit"; pname = "nvidia-container-toolkit";
version = "1.3.0"; version = "1.3.0";

12
pkgs/top-level/all-packages.nix
View File

@ -15416,15 +15416,17 @@ in
nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { };
mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: 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}"; name = "nvidia-containers-${name}";
paths = [ paths = [
(callPackage ../applications/virtualization/libnvidia-container { }) (callPackage ../applications/virtualization/libnvidia-container { })
(callPackage ../applications/virtualization/nvidia-container-runtime { nvidia-container-runtime
inherit containerRuntimePath configTemplate;
})
(callPackage ../applications/virtualization/nvidia-container-toolkit { (callPackage ../applications/virtualization/nvidia-container-toolkit {
inherit containerRuntimePath configTemplate; inherit nvidia-container-runtime;
}) })
] ++ additionalPaths; ] ++ additionalPaths;
}; };