From 77d58ac0fc248f920a0d6dfb636f4b70738d69b1 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Fri, 6 Mar 2026 11:16:50 -0800
Subject: [PATCH] freebsd.zfsd: fix build

Co-Authored-By: Audrey Dutcher <audrey@rhelmot.io>
---
 .../bsd/freebsd/patches/15.0/zfsd-headers.patch      | 12 ++++++++++++
 pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix     |  2 ++
 pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix           |  2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch

diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch
new file mode 100644
index 000000000000..f14faf0a9a32
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc
+index 852767aeb227..69086b4a7255 100644
+--- a/cddl/usr.sbin/zfsd/case_file.cc
++++ b/cddl/usr.sbin/zfsd/case_file.cc
+@@ -49,6 +49,7 @@
+ #include <iomanip>
+ #include <fstream>
+ #include <functional>
++#include <algorithm>
+ #include <sstream>
+ #include <syslog.h>
+ #include <unistd.h>
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix
index 0cf5421daead..8770e1c96b0c 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix
@@ -11,5 +11,7 @@ mkDerivation {
     "debug"
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-std=c++23 -Wno-nullability-completeness";
+
   meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix
index c5ca7aa1211b..71a2e9746f3a 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix
@@ -29,6 +29,8 @@ mkDerivation {
 
   MK_TESTS = "no";
 
+  env.NIX_CFLAGS_COMPILE = "-std=c++23 -Wno-nullability-completeness";
+
   meta = {
     mainProgram = "zfsd";
     platforms = lib.platforms.freebsd;