From 35b41917ac3000754e2a1926bcf4f1c768a6c5c2 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 27 Jan 2026 22:01:07 -0500
Subject: [PATCH] tayga: 0.9.5 -> 0.9.6

Diff: https://github.com/apalrd/tayga/compare/0.9.5...0.9.6
---
 pkgs/by-name/ta/tayga/package.nix | 45 ++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ta/tayga/package.nix b/pkgs/by-name/ta/tayga/package.nix
index c5301a0d33fe..c153319c1677 100644
--- a/pkgs/by-name/ta/tayga/package.nix
+++ b/pkgs/by-name/ta/tayga/package.nix
@@ -2,40 +2,55 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.9.5";
   pname = "tayga";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "apalrd";
     repo = "tayga";
     tag = finalAttrs.version;
-    hash = "sha256-xOm4fetFq2UGuhOojrT8WOcX78c6MLTMVbDv+O62x2E=";
+    hash = "sha256-OsF2RqZzDvf8FMLHN6YAKvWfFgAIQfVkbBTC8hjf2dU=";
   };
 
-  makeFlags = [ "CC=${lib.getExe stdenv.cc}" ];
+  patches = [
+    # nat64.c: call inet_ntop with properly sized buffers
+    # https://github.com/apalrd/tayga/pull/168
+    (fetchpatch2 {
+      url = "https://github.com/apalrd/tayga/commit/b41bd030846451d72b277854678b58370b1d5c8f.patch?full_index=1";
+      hash = "sha256-vFQTlZs9ghxdx4k/iODDOUBAglyll1OxUdTjzDtcwB0=";
+    })
+  ];
+
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+  ];
+
+  installFlags = [
+    "WITH_SYSTEMD=1"
+    "sbindir=${placeholder "out"}/bin"
+    "sysconfdir=${placeholder "out"}/etc"
+    "servicedir=${placeholder "out"}/lib/systemd/system"
+  ];
+
+  postInstall = ''
+    substituteInPlace "$out/lib/systemd/system/tayga@.service" \
+      --replace-fail "ExecSearchPath=/usr/local/sbin:/usr/sbin" "" \
+      --replace-fail "ExecStart=tayga" "ExecStart=$out/bin/tayga"
+  '';
 
   env = lib.optionalAttrs stdenv.hostPlatform.is32bit {
     NIX_CFLAGS_COMPILE = "-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64";
   };
 
-  preBuild = ''
-    echo "#define TAYGA_VERSION \"${finalAttrs.version}\"" > version.h
-  '';
-
-  installPhase = ''
-    install -Dm755 tayga $out/bin/tayga
-    install -D tayga.conf.5 $out/share/man/man5/tayga.conf.5
-    install -D tayga.8 $out/share/man/man8/tayga.8
-    cp -R docs $out/share/
-    cp tayga.conf.example $out/share/docs/
-  '';
-
   passthru.tests.tayga = nixosTests.tayga;
 
+  doCheck = true;
+
   meta = {
     description = "Userland stateless NAT64 daemon";
     longDescription = ''