rationalize packages, add foment

2 files changed, 43 insertions, 19 deletions

diff --git a/guix/mcgoron/guix/chibi.scm b/lib/mcgoron/guix/chibi.scm
index 49e7545..7f256b5 100644
--- a/guix/mcgoron/guix/chibi.scm
+++ b/lib/mcgoron/guix/chibi.scm
@@ -15,26 +15,12 @@
  |#
 
 (define-module (mcgoron guix chibi)
-  #:use-module (guix packages)
   #:use-module (guix build-system)
   #:use-module (guix build-system copy)
-  #:use-module (gnu packages scheme)
-  #:use-module (guix gexp)
-  #:export (chibi-scheme-with-path
-            chibi-scheme-build-system))
+  #:use-module (gnu packages chibi-scheme-with-path)
+  #:use-module (guix gexp))
 
-(define chibi-lib-dir "share/guix-chibi")
-(define chibi-binlib-dir "lib/guix-chibi")
-
-(define-public chibi-scheme-with-path
-  (package
-   (inherit chibi-scheme)
-   (native-search-paths
-    (list (search-path-specification
-           (variable "CHIBI_MODULE_PATH")
-           (files (list chibi-lib-dir chibi-binlib-dir)))))))
-
-(define chibi-scheme-build-system
+(define-public chibi-scheme-build-system
   (let ((lower* (build-system-lower copy-build-system)))
     (build-system
      (name 'chibi-pure)
@@ -50,5 +36,3 @@
                      #:install-plan
                      `'(("." ,(string-append chibi-lib-dir
                                              "/"))))))))))))
-
-chibi-scheme-with-path
diff --git a/lib/mcgoron/guix/foment.scm b/lib/mcgoron/guix/foment.scm
new file mode 100644
index 0000000..bc38da7
--- /dev/null
+++ b/lib/mcgoron/guix/foment.scm
@@ -0,0 +1,40 @@
+#| Copyright (C) 2025 Peter McGoron
+ |
+ | This program is free software: you can redistribute it and/or modify it
+ | under the terms of the GNU General Public License as published by the
+ | Free Software Foundation, either version 3 of the License, or (at your
+ | option) any later version.
+ |
+ | This program is distributed in the hope that it will be useful, but
+ | WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ | General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License along
+ | with this program.  If not, see <https://www.gnu.org/licenses/>.
+ |#
+
+(define-module (mcgoron guix foment)
+  #:use-module (guix build-system)
+  #:use-module (guix build-system copy)
+  #:use-module (gnu packages foment)
+  #:use-module (guix gexp))
+
+(define-public foment-build-system
+  (let ((lower* (build-system-lower copy-build-system)))
+    (build-system
+     (name 'foment-scheme)
+     (description "Build system for copying Scheme libraries to Foment module directory")
+     (lower
+      (lambda args
+        (apply lower*
+               (if (memq #:install-plan args)
+                   args
+                   (append
+                    args
+                    (list
+                     #:install-plan
+                     `'(("." ,(string-append foment-lib-dir
+                                             "/"))))))))))))
+
+