guix.scm updated

guix.scm

@@ -15,41 +15,50 @@
   (package
     (name "bible-tools")
     (version "1.0")
-    (source (origin
+    (source
+      (origin
         (method git-fetch)
         (uri (git-reference
-                    (url
+               (url "https://git.silasvedder.xyz/silasfox/bible-tools.git")
-                     "https://git.silasvedder.xyz/silasfox/bible-tools.git")
                (commit "5d0dbd6")))
         (file-name "bible-tools-1.0-checkout")
-              (sha256
+        (sha256 (base32 "1x03fzal7vsc7j4bbsphs3v6fsa6m0wkcjzk7a56nn0by3a397dw"))))
-               (base32
-                "1x03fzal7vsc7j4bbsphs3v6fsa6m0wkcjzk7a56nn0by3a397dw"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:modules ((ice-9 match)
+      `(#:modules
+        ((ice-9 match)
          (ice-9 ftw)
          ,@%gnu-build-system-modules)
-       #:phases (modify-phases %standard-phases
+        #:phases
-                  (add-after 'install 'hall-wrap-binaries
+        (modify-phases
+          %standard-phases
+          (add-after
+            'install
+            'hall-wrap-binaries
             (lambda* (#:key inputs outputs #:allow-other-keys)
-                      (let* ((compiled-dir (lambda (out version)
+              (let* ((compiled-dir
-                                             (string-append out "/lib/guile/"
+                       (lambda (out version)
+                         (string-append
+                           out
+                           "/lib/guile/"
                            version
                            "/site-ccache")))
-                             (uncompiled-dir (lambda (out version)
+                     (uncompiled-dir
-                                               (string-append out
+                       (lambda (out version)
+                         (string-append
+                           out
                            "/share/guile/site"
-                                                (if (string-null? version) ""
+                           (if (string-null? version) "" "/")
-                                                    "/") version)))
+                           version)))
-                             (dep-path (lambda (env modules path)
+                     (dep-path
-                                         (list env ":"
+                       (lambda (env modules path)
+                         (list env
+                               ":"
                                'prefix
                                (cons modules
                                      (map (lambda (input)
-                                                            (string-append (assoc-ref
+                                            (string-append
-                                                                            inputs
+                                              (assoc-ref inputs input)
-                                                                            input)
                                               path))
                                           ,''())))))
                      (out (assoc-ref outputs "out"))
@@ -57,21 +66,22 @@
                      (site (uncompiled-dir out "")))
                 (match (scandir site)
                        (("." ".." version)
-                           (for-each (lambda (file)
+                        (for-each
-                                       (wrap-program (string-append bin file)
+                          (lambda (file)
+                            (wrap-program
+                              (string-append bin file)
                               (dep-path
                                 "GUILE_LOAD_PATH"
-                                                      (uncompiled-dir out
+                                (uncompiled-dir out version)
-                                                                      version)
+                                (uncompiled-dir "" version))
-                                                      (uncompiled-dir ""
-                                                                      version))
                               (dep-path
                                 "GUILE_LOAD_COMPILED_PATH"
-                                                      (compiled-dir out
+                                (compiled-dir out version)
-                                                                    version)
                                 (compiled-dir "" version))))
-                                     ,''("bible2latex" "count-words")) #t))))))))
+                          ,''("bible-app" "word-counter" "bible2latex"))
-    (native-inputs `(("autoconf" ,autoconf)
+                        #t))))))))
+    (native-inputs
+      `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("pkg-config" ,pkg-config)
         ("texinfo" ,texinfo)))