git.iko.soy/typeable/nixpkgs
on master help sign in
nvidia-container-toolkit: pass nvidia-container-runtime into drv
commit8169d5c64451122b4867b5457a1d628354162fbe authorPhillip Cloud <cloud@standard.ai> dateSun 10 Jan 2021, 08:09 (6 years ago) parentf91f9ea
2 files changed+8−12
pkgs/applications/virtualization/nvidia-container-toolkit/default.nix+1−7 pkgs/top-level/all-packages.nix+7−5
pkgs/applications/virtualization/nvidia-container-toolkit/default.nix+1−7
@@ -3,14 +3,8 @@
33, buildGoModule
44, callPackage
55, makeWrapper
6−, containerRuntimePath
7−, configTemplate
6+, nvidia-container-runtime
87}:
9−let
10− nvidia-container-runtime = callPackage ../nvidia-container-runtime {
11− inherit containerRuntimePath configTemplate;
12− };
13−in
148buildGoModule rec {
159 pname = "nvidia-container-toolkit";
1610 version = "1.3.0";
pkgs/top-level/all-packages.nix+7−5
@@ -15416,15 +15416,17 @@ in
1541615416 nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { };
1541715417
1541815418 mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }:
15419− symlinkJoin {
15419+ let
15420+ nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime {
15421+ inherit containerRuntimePath configTemplate;
15422+ };
15423+ in symlinkJoin {
1542015424 name = "nvidia-containers-${name}";
1542115425 paths = [
1542215426 (callPackage ../applications/virtualization/libnvidia-container { })
15423− (callPackage ../applications/virtualization/nvidia-container-runtime {
15424− inherit containerRuntimePath configTemplate;
15425− })
15427+ nvidia-container-runtime
1542615428 (callPackage ../applications/virtualization/nvidia-container-toolkit {
15427− inherit containerRuntimePath configTemplate;
15429+ inherit nvidia-container-runtime;
1542815430 })
1542915431 ] ++ additionalPaths;
1543015432 };