From 088569463b9de59ce7928ca5a9b4a2413533444a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 20 Sep 2024 15:01:32 +0200
Subject: [PATCH 1/2] Fix build without GC

---
 src/libexpr/eval-gc.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libexpr/eval-gc.hh b/src/libexpr/eval-gc.hh
index 1be9ff65b57..3b420e41867 100644
--- a/src/libexpr/eval-gc.hh
+++ b/src/libexpr/eval-gc.hh
@@ -23,7 +23,8 @@ template<typename T>
 using gc_allocator = std::allocator<T>;
 
 #  define GC_MALLOC_ATOMIC std::malloc
-#  define GC_STRDUP std::strdup
+#  define GC_STRDUP strdup
+
 struct gc
 {};
 

From ec47133be343bfdf2aad93dc75b5943f5667f1b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 20 Sep 2024 15:08:45 +0200
Subject: [PATCH 2/2] Fix warning

---
 src/libexpr-c/nix_api_expr.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libexpr-c/nix_api_expr.cc b/src/libexpr-c/nix_api_expr.cc
index 8f21d702221..333e99460ba 100644
--- a/src/libexpr-c/nix_api_expr.cc
+++ b/src/libexpr-c/nix_api_expr.cc
@@ -16,8 +16,6 @@
 
 #if HAVE_BOEHMGC
 #  include <mutex>
-#  define GC_INCLUDE_NEW 1
-#  include "gc_cpp.h"
 #endif
 
 nix_err nix_libexpr_init(nix_c_context * context)