From 2b3eaf55afc0e2a77677e3b1522879d7a5361640 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Wed, 3 Jan 2024 23:53:51 +0000
Subject: [PATCH] nvidia-docker: unbreak the runc symlink

(cherry picked from commit 1e1eb8ba6ee7e3428599a27b1b81e2e1be41b4fa)
---
 .../virtualization/nvidia-container-toolkit/default.nix   | 8 ++++++++
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
index a174c3031227..71fc18f0b327 100644
--- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
+++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
@@ -47,6 +47,14 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
+  preConfigure = ''
+    # Ensure the runc symlink isn't broken:
+    if ! readlink --quiet --canonicalize-existing "${isolatedContainerRuntimePath}/runc" ; then
+      echo "${isolatedContainerRuntimePath}/runc: broken symlink" >&2
+      exit 1
+    fi
+  '';
+
   checkFlags =
     let
       skippedTests = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ace5c084e77f..c3cd76e3afd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24197,7 +24197,7 @@ with pkgs;
 
   nvidia-docker = mkNvidiaContainerPkg {
     name = "nvidia-docker";
-    containerRuntimePath = "${docker}/libexec/docker/runc";
+    containerRuntimePath = "${docker}/libexec/docker/docker";
     configTemplate = ../applications/virtualization/nvidia-docker/config.toml;
     additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ];
   };