diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/nvidia-container-toolkit/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 451ddb4906bc..a584be35e7b2 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -6,8 +6,8 @@ , linkFarm , writeShellScript , formats -, containerRuntimePath -, configTemplate +, containerRuntimePath ? null +, configTemplate ? null , configTemplatePath ? null , libnvidia-container , cudaPackages @@ -91,7 +91,7 @@ buildGoModule rec { makeWrapper ]; - preConfigure = '' + preConfigure = lib.optionalString (containerRuntimePath != null) '' # Ensure the runc symlink isn't broken: if ! readlink --quiet --canonicalize-existing "${isolatedContainerRuntimePath}/runc" ; then echo "${isolatedContainerRuntimePath}/runc: broken symlink" >&2 @@ -109,7 +109,7 @@ buildGoModule rec { in [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; - postInstall = '' + postInstall = lib.optionalString (containerRuntimePath != null) '' mkdir -p $out/etc/nvidia-container-runtime # nvidia-container-runtime invokes docker-runc or runc if that isn't diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2adaad5ac8e2..6c4c2a20b25a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24067,6 +24067,8 @@ with pkgs; nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; nv-codec-headers-12 = callPackage ../development/libraries/nv-codec-headers/12_x.nix { }; + nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit { }; + nvidiaCtkPackages = callPackage ../applications/virtualization/nvidia-container-toolkit/packages.nix { }; |