From 8b7eb9a077bd737a21dc80b3f96b0791a19c859c Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sat, 14 Oct 2017 21:47:54 +0200
Subject: [PATCH] Unbreak rnrs modules

Somehow we managed to break (import r4rs), (import r4rs-null) and
(import r5rs-null).  This unbreaks imports of these builtin modules.
---
 eval.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/eval.scm b/eval.scm
index 10162865..57fc212f 100644
--- a/eval.scm
+++ b/eval.scm
@@ -895,8 +895,15 @@
 (define-foreign-variable uses-soname? bool "C_USES_SONAME")
 
 (define-constant core-unit-requirements
-  '((scheme ; XXX not totally correct, also needs eval
-     . (##core#require library))
+  '((scheme . (##core#begin
+	       (##core#require library)
+	       (##core#require eval)))
+    ;; r5rs can be skipped, it is defined as an alias for "scheme"
+    (r4rs . (##core#begin
+	       (##core#require library)
+	       (##core#require eval)))
+    (r4rs-null . (##core#begin))
+    (r5rs-null . (##core#begin))
     (chicken.foreign
      . (##core#require-for-syntax chicken-ffi-syntax))
     (chicken.condition
-- 
2.11.0