summaryrefslogtreecommitdiff
path: root/nix/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch
diff options
context:
space:
mode:
authorEugen Wissner <belka@caraus.de>2020-11-30 08:59:41 +0100
committerEugen Wissner <belka@caraus.de>2020-11-30 08:59:41 +0100
commit49066ca33e354d21a10a3a9bd8ebc24d4fbb4ec0 (patch)
treedf0f1f710d0be768a1d2120a83f940382ca99700 /nix/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch
parentc684e04e112094a439d67faec095d428f8fda822 (diff)
downloadslackbuilder-49066ca33e354d21a10a3a9bd8ebc24d4fbb4ec0.tar.gz
nix: Added
Diffstat (limited to 'nix/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch')
-rw-r--r--nix/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/nix/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch b/nix/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch
new file mode 100644
index 0000000..9aade59
--- /dev/null
+++ b/nix/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch
@@ -0,0 +1,42 @@
+From d5c7efae3833b4c8d0012c5f9816ae4b6c28a3e7 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra <edolstra@gmail.com>
+Date: Thu, 6 Aug 2020 11:40:41 +0200
+Subject: [PATCH] repl.cc: Check for HAVE_BOEHMGC
+
+Fixes #3906.
+
+(cherry picked from commit 59067f0f587f75908c4f990bcbab29340c7f7652)
+---
+ src/nix/repl.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/nix/repl.cc b/src/nix/repl.cc
+index 04bc82cc0..0b696a340 100644
+--- a/src/nix/repl.cc
++++ b/src/nix/repl.cc
+@@ -31,8 +31,10 @@ extern "C" {
+ #include "command.hh"
+ #include "finally.hh"
+
++#if HAVE_BOEHMGC
+ #define GC_INCLUDE_NEW
+ #include <gc/gc_cpp.h>
++#endif
+
+ namespace nix {
+
+@@ -44,7 +46,10 @@ namespace nix {
+ #define ESC_CYA "\033[36m"
+ #define ESC_END "\033[0m"
+
+-struct NixRepl : gc
++struct NixRepl
++ #if HAVE_BOEHMGC
++ : gc
++ #endif
+ {
+ string curDir;
+ EvalState state;
+--
+2.28.0
+