From 32d4ea81402cc40ac0acb686e2bac9f130d368c1 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 22 Sep 2025 09:09:45 -0300
Subject: [PATCH] fix cross-build for cygwin

---
 nix-meson-build-support/common/meson.build | 9 +++++++++
 src/libexpr/meson.build                    | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/nix-meson-build-support/common/meson.build b/nix-meson-build-support/common/meson.build
index c76c2971c..8c4e98862 100644
--- a/nix-meson-build-support/common/meson.build
+++ b/nix-meson-build-support/common/meson.build
@@ -5,6 +5,15 @@ if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
   deps_private += dependency('threads')
 endif
 
+if host_machine.system() == 'cygwin'
+  # -std=gnu on cygwin defines 'unix', which conflicts with the namespace
+  add_project_arguments(
+    '-D_POSIX_C_SOURCE=200809L',
+    '-D_GNU_SOURCE',
+    language : 'cpp',
+  )
+endif
+
 add_project_arguments(
   '-Wdeprecated-copy',
   '-Werror=suggest-override',
diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
index 32a4d511b..d24e7fae3 100644
--- a/src/libexpr/meson.build
+++ b/src/libexpr/meson.build
@@ -69,6 +69,10 @@ if bdw_gc.found()
     define_value = cxx.has_function(funcspec).to_int()
     configdata_priv.set(define_name, define_value)
   endforeach
+  if host_machine.system() == 'cygwin'
+    # undefined reference to `__wrap__Znwm'
+    configdata_pub.set('GC_NO_INLINE_STD_NEW', 1)
+  endif
 endif
 # Used in public header. Affects ABI!
 configdata_pub.set('NIX_USE_BOEHMGC', bdw_gc.found().to_int())