From b8872e957f059e5129b0f0558c448f01134cfa7e Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 29 Dec 2024 17:58:31 -0700
Subject: [PATCH] [NixOS] Add bin to the plugins path

---
 nixos/k3s.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/k3s.nix b/nixos/k3s.nix
index 159918b2..497a782d 100644
--- a/nixos/k3s.nix
+++ b/nixos/k3s.nix
@@ -8,6 +8,12 @@ with lib; let
   cfg = config.myModules.railbird-k3s;
   mount-path = "/var/lib/railbird/bucket";
   bucket-name = "railbird-dev-videos";
+  plugins-path = pkgs.buildEnv {
+    name = "combined-cni-plugins";
+    paths = [
+      pkgs.cni-plugins pkgs.calico-cni-plugin
+    ];
+  };
 in {
   options = {
     myModules.railbird-k3s = {
@@ -45,12 +51,7 @@ in {
         plugins."io.containerd.grpc.v1.cri" = {
           enable_cdi = true;
           cdi_spec_dirs = [ "/var/run/cdi" ];
-          cni.bin_dir = pkgs.buildEnv {
-            name = "combined-cni-plugins";
-            paths = [
-              pkgs.cni-plugins pkgs.calico-cni-plugin
-            ];
-          };
+          cni.bin_dir = "${plugins-path}/bin";
         };
       };
     };