From 8169d5c64451122b4867b5457a1d628354162fbe Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sun, 10 Jan 2021 08:09:36 -0500
Subject: nvidia-container-toolkit: pass nvidia-container-runtime into drv

---
 .../virtualization/nvidia-container-toolkit/default.nix      |  8 +-------
 pkgs/top-level/all-packages.nix                              | 12 +++++++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
index fd6edc64a0f6..1ef9603195d0 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 d90cabd1f037..ff32fe785933 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;
     };
-- 
cgit v1.2.3