guix-kakafarm-channel

commit 5a18f9f52135a379ae9e1f3ea673de14f39b3466
parent 9b18d6eecb2dadbaf701b1f53b9aca1091db2251
Author: Yuval Langer <yuval.langer@gmail.com>
Date:   Thu, 24 Oct 2024 17:02:40 +0300

Ribbit Javascript package definition outputs a repl.js file.

Diffstat:
M
kakafarm/packages/ribbit.scm
 | 
36
++++++++++++++++++------------------

1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/kakafarm/packages/ribbit.scm b/kakafarm/packages/ribbit.scm
@@ -116,27 +116,27 @@
         (with-imported-modules (source-module-closure
                                 '((guix build utils)))
           #~(let* ((ribbit-src-path (string-append #$ribbit-rsc.exe
-                                                   "/usr/src"))
-                   (ribbit-r4rs-repl-source-file (string-append #$ribbit-rsc.exe
-                                                                "/usr/src/lib/r4rs/repl.scm"))
-                   (lib-path (string-append #$output
-                                            "/usr/lib/"
-                                            #$name
-                                            "-"
-                                            #$version))
-                   (repl-target (string-append lib-path
-                                               "/repl.js")))
+                                                   "/usr/src/"
+                                                   #$(package-name ribbit-rsc.exe)
+                                                   "-"
+                                                   #$(package-version ribbit-rsc.exe)))
+                   (output-lib-path (string-append #$output
+                                                   "/usr/lib/"
+                                                   #$name
+                                                   "-"
+                                                   #$version))
+                   (output-repl-target (string-append output-lib-path
+                                                      "/repl.js")))
               (import (ice-9 ftw)
                       (guix build utils))
-              (mkdir-p lib-path)
+              (mkdir-p output-lib-path)
               (chdir ribbit-src-path)
-              (system* ,rsc.exe
-                        "-t" "js"
-                        "-l" "r4rs"
-                        ,ribbit-r4rs-repl-source-file
-                        "-o" ,repl-target
-                        )
-              (format #t "######## ~S~%" (scandir lib-path))
+              (system* "./rsc.exe"
+                       "-t" "js"
+                       "-l" "r4rs"
+                       "lib/r4rs/repl.scm"
+                       "-o" output-repl-target
+                       )
               #t))))
       (home-page git-repository-url)
       (synopsis