From 2f6284499a2e68ad3c0296a026efec743c821b04 Mon Sep 17 00:00:00 2001 From: Silas Vedder Date: Fri, 14 Oct 2022 15:25:29 +0200 Subject: [PATCH] guix.scm updated --- guix.scm | 126 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 58 deletions(-) diff --git a/guix.scm b/guix.scm index 7797868..80a44ae 100644 --- a/guix.scm +++ b/guix.scm @@ -15,66 +15,76 @@ (package (name "bible-tools") (version "1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url - "https://git.silasvedder.xyz/silasfox/bible-tools.git") - (commit "5d0dbd6"))) - (file-name "bible-tools-1.0-checkout") - (sha256 - (base32 - "1x03fzal7vsc7j4bbsphs3v6fsa6m0wkcjzk7a56nn0by3a397dw")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.silasvedder.xyz/silasfox/bible-tools.git") + (commit "5d0dbd6"))) + (file-name "bible-tools-1.0-checkout") + (sha256 (base32 "1x03fzal7vsc7j4bbsphs3v6fsa6m0wkcjzk7a56nn0by3a397dw")))) (build-system gnu-build-system) (arguments - `(#:modules ((ice-9 match) - (ice-9 ftw) - ,@%gnu-build-system-modules) - #:phases (modify-phases %standard-phases - (add-after 'install 'hall-wrap-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((compiled-dir (lambda (out version) - (string-append out "/lib/guile/" - version - "/site-ccache"))) - (uncompiled-dir (lambda (out version) - (string-append out - "/share/guile/site" - (if (string-null? version) "" - "/") version))) - (dep-path (lambda (env modules path) - (list env ":" - 'prefix - (cons modules - (map (lambda (input) - (string-append (assoc-ref - inputs - input) - path)) - ,''()))))) - (out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (site (uncompiled-dir out ""))) - (match (scandir site) - (("." ".." version) - (for-each (lambda (file) - (wrap-program (string-append bin file) - (dep-path - "GUILE_LOAD_PATH" - (uncompiled-dir out - version) - (uncompiled-dir "" - version)) - (dep-path - "GUILE_LOAD_COMPILED_PATH" - (compiled-dir out - version) - (compiled-dir "" version)))) - ,''("bible2latex" "count-words")) #t)))))))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + `(#:modules + ((ice-9 match) + (ice-9 ftw) + ,@%gnu-build-system-modules) + #:phases + (modify-phases + %standard-phases + (add-after + 'install + 'hall-wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((compiled-dir + (lambda (out version) + (string-append + out + "/lib/guile/" + version + "/site-ccache"))) + (uncompiled-dir + (lambda (out version) + (string-append + out + "/share/guile/site" + (if (string-null? version) "" "/") + version))) + (dep-path + (lambda (env modules path) + (list env + ":" + 'prefix + (cons modules + (map (lambda (input) + (string-append + (assoc-ref inputs input) + path)) + ,''()))))) + (out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (site (uncompiled-dir out ""))) + (match (scandir site) + (("." ".." version) + (for-each + (lambda (file) + (wrap-program + (string-append bin file) + (dep-path + "GUILE_LOAD_PATH" + (uncompiled-dir out version) + (uncompiled-dir "" version)) + (dep-path + "GUILE_LOAD_COMPILED_PATH" + (compiled-dir out version) + (compiled-dir "" version)))) + ,''("bible-app" "word-counter" "bible2latex")) + #t)))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-3.0))) (propagated-inputs `()) (synopsis "")