chez

1 files changed, 34 insertions, 5 deletions

diff --git a/mcgoron/guix/scheme-packages.scm b/mcgoron/guix/scheme-packages.scm
index 84f6675..4018efe 100644
--- a/mcgoron/guix/scheme-packages.scm
+++ b/mcgoron/guix/scheme-packages.scm
@@ -37,6 +37,7 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages chez)
   #:use-module (guix gexp))
 
 ;;;;;;;;;;;;;
@@ -587,7 +588,7 @@ developers freedom in balancing features and footprint.")
 (define-public mosh-build-system
   (default-copying-build-system 'mosh
                                 "Copy Scheme libraries into Mosh directory"
-                                foment-lib-dir))
+                                mosh-lib-dir))
 
 (define-public mosh-scheme
   (package
@@ -600,10 +601,6 @@ developers freedom in balancing features and footprint.")
          (patches (search-patches "mcgoron/guix/patches/mosh-0.2.9-rc1-fix-ffitest.patch"))
          (sha256 (base32 "07w49dbhy3zgn9kq8lqwshjy66plpjkb9dv20sczkqr8w4vbs4cz"))))
     (build-system gnu-build-system)
-    #;(arguments '(#:phases (modify-phases %standard-phases
-                            ;; Tests don't work yet. Issues with network.
-                            (add-before 'check 'remove-broken-tests
-                              (lambda _ )))))
     (inputs (list oniguruma gmp openssl))
     (home-page "https://mosh.monaos.org")
     (synopsis "Free and fast R6RS interpreter")
@@ -694,3 +691,35 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
 
 
 ;;;; Ypsilon: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ypsilon/ypsilon-0.9.6.update3.tar.gz
+
+;;;;;;;;;
+;;;; Chez
+;;;;;;;;;
+
+(define-public chez-lib-dir "share/chez")
+
+(define-public chez-scheme-build-system
+  (default-copying-build-system 'chez
+                                "Copy Scheme libraries into Chez directory"
+                                chez-lib-dir))
+
+(define-public chez-scheme-with-path
+  (package/path chez-scheme
+                "chez-scheme"
+                "Chez with Guix paths"
+                "Wrapper for Chez that adds Guix-managed paths"
+                "/bin/chez-scheme"
+                "/bin/chez-scheme"
+                "GUIX_CHEZ_PATH"
+                (list r6rs-search-path-specification)
+                chez-lib-dir
+                `(lambda (sh impl)
+                   (format #t
+                    "#!~a
+
+                     ~a
+                     exec -a $0 \"~a\" \"$@\""
+                    sh
+                    ,(append-to "CHEZSCHEMELIBDIRS" "GUIX_CHEZ_PATH" "R6RS_LIBRARY_PATH")
+                    impl))))
+