patch chibi to use R7RS_LIBRARY_PATH

1 files changed, 35 insertions, 3 deletions

diff --git a/mcgoron/guix/scheme-packages.scm b/mcgoron/guix/scheme-packages.scm
index bbec95b..648f654 100644
--- a/mcgoron/guix/scheme-packages.scm
+++ b/mcgoron/guix/scheme-packages.scm
@@ -25,6 +25,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system)
   #:use-module (guix build-system copy)
+  #:use-module (gnu packages scheme)
   #:use-module (guix gexp))
 
 (define-public r7rs-lib-dir "share/scheme/r7rs")
@@ -65,6 +66,10 @@
         (method url-fetch)
         (uri "https://florida.moe/ftp/hello-world-r7rs/1.0.0.tar.gz")
         (sha256 (base32 "1cx9p2mz3cmn02imp137vqmq8aw3mh5s23ybprgkc8pshgmaf8jn"))))))
+(define-public r7rs-search-path-specification 
+  (search-path-specification
+    (variable "R7RS_LIBRARY_PATH")
+    (files (list r7rs-lib-dir))))
 
 (define-public foment-lib-dir "share/foment")
 (define-public foment-build-system
@@ -88,9 +93,7 @@
                           (search-path-specification
                            (variable "FOMENT_LIBPATH")
                            (files (list foment-lib-dir)))
-                          (search-path-specification
-                           (variable "R7RS_LIBRARY_PATH")
-                           (files (list r7rs-lib-dir)))))
+                          r7rs-search-path-specification))
     
     (arguments 
       (list
@@ -136,3 +139,32 @@
     (native-inputs (list bash))
     (description "Foment is an implementation of Scheme.")))
 
+(define-public chibi-lib-dir "share/guix-chibi")
+(define-public chibi-binlib-dir "lib/guix-chibi")
+
+(define-public chibi-scheme-build-system
+  (default-copying-build-system 'chibi-scheme
+                                "Copy Scheme libraries into Chibi Scheme directory"
+                                foment-lib-dir))
+
+(define-public chibi-scheme-with-path
+  (package
+   (inherit chibi-scheme)
+   (name "chibi-scheme-with-path")
+   (home-page "https://github.com/ashinn/chibi-scheme")
+   (version "0.11")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference (url home-page) (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02zq35hdbi03rmmamx6ml4ihsigdl4mmbf6d9ysazv8ciiln5v4b"))
+       (patches (search-patches "mcgoron/guix/patches/chibi-scheme-0.11-library-path.patch"))))
+   (native-search-paths
+    (list (search-path-specification
+           (variable "CHIBI_MODULE_PATH")
+           (files (list chibi-lib-dir chibi-binlib-dir)))
+          r7rs-search-path-specification))))
+
+