From 24c5bb3ec67377d30dde38f9bbd3440b2d384a83 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 31 Dec 2024 02:15:10 -0700
Subject: [PATCH] [NixOS] Try simple no errors nvidia-cdi-hook

---
 nixos/nix.nix     |  2 +-
 nixos/overlay.nix | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/nix.nix b/nixos/nix.nix
index b314c35b..85a54ba6 100644
--- a/nixos/nix.nix
+++ b/nixos/nix.nix
@@ -45,7 +45,7 @@
     };
 
     nixpkgs.overlays = [
-      (import ./nvidia-container-toolkit-overlay.nix)
+      # (import ./nvidia-container-toolkit-overlay.nix)
       (import ./runc-overlay.nix)
       (import ./overlay.nix)
     ] ++ (if config.imalison.nixOverlay.enable then [ inputs.nix.overlays.default ] else []);
diff --git a/nixos/overlay.nix b/nixos/overlay.nix
index 405bb9ac..f5c99ee8 100644
--- a/nixos/overlay.nix
+++ b/nixos/overlay.nix
@@ -1,5 +1,16 @@
 final: prev:
 {
+  nvidia-container-toolkit = prev.nvidia-container-toolkit.overrideAttrs(old: {
+    postInstall = ''
+      ${old.postInstall or ""}
+      mv $tools/bin/nvidia-cdi-hook $tools/bin/.nvidia-cdi-hook-wrapped
+      cat > $tools/bin/nvidia-cdi-hook <<EOF
+      #!${final.bash}/bin/bash
+      set +e
+      $tools/bin/.nvidia-cdi-hook-wrapped "\$@" || true
+      EOF
+    '';
+  });
   runc = final.stdenv.mkDerivation {
     pname = "runc-with-logging";
     version = builtins.getAttr "version" prev.runc or "unknown";