From 7b251c9356bc7bb383ebeedcd0045b3ae431bff7 Mon Sep 17 00:00:00 2001
From: Robbie Buxton <67549526+RobbieBuxton@users.noreply.github.com>
Date: Sat, 11 May 2024 15:35:14 +0100
Subject: [PATCH] switched to default buildGoModule and applied patch to fix
 gobuild 120+ compat issue (#139)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Christian Kögler <ck3d@gmx.de>
---
 modules/flake/k3s/builder.nix | 6 ++++++
 modules/flake/overlays.nix    | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/flake/k3s/builder.nix b/modules/flake/k3s/builder.nix
index 51a5846..2d531eb 100644
--- a/modules/flake/k3s/builder.nix
+++ b/modules/flake/k3s/builder.nix
@@ -50,6 +50,7 @@ lib:
 , fetchurl
 , fetchzip
 , fetchgit
+, fetchpatch
 , zstd
 , yq-go
 , sqlite
@@ -191,6 +192,11 @@ let
       ../patches/k3s-rootless-state-dir.patch
       # See: https://github.com/k3s-io/k3s/pull/9319
       ../patches/k3s-nix-snapshotter.patch
+      # See: https://github.com/k3s-io/k3s/pull/9064
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/k3s-io/k3s/pull/9064.patch";
+        sha256 = "sha256-xp9nGIalSvDLfccQ+HNQqWT8z2LKH1HfCuaYxieMT94=";
+      })
     ];
 
     nativeBuildInputs = [ pkg-config ];
diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix
index fca7199..ae1bbdf 100644
--- a/modules/flake/overlays.nix
+++ b/modules/flake/overlays.nix
@@ -25,9 +25,7 @@
         nix-snapshotter
       ;
 
-      k3s = (self.callPackage ./k3s {
-        buildGoModule = self.buildGo120Module;
-      }).k3s_1_27;
+      k3s = (self.callPackage ./k3s {}).k3s_1_27;
     };
 
   perSystem = { system, ... }: {