From e25e6991e7598cf3f7eb0bed5bdd9db37cd55401 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 24 Mar 2022 00:18:55 +0530 Subject: gnu: tissue: Update to 0.1.0-0.b154339. * gn/packages/gemini.scm (tissue): Update to 0.1.0-0.b154339. [arguments]: Import target-guile-effective-version from (guix build guile-build-system). Wrap executable to set GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH. --- gn/packages/gemini.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gn/packages/gemini.scm b/gn/packages/gemini.scm index 865e873..ff2dcd6 100644 --- a/gn/packages/gemini.scm +++ b/gn/packages/gemini.scm @@ -32,7 +32,7 @@ ,@(package-native-inputs guix:skribilo)))))) (define-public tissue - (let ((commit "17d101b2f97edc8574528d5f05dd952921b67027") + (let ((commit "b1543397a66cced4e3ea92ead469a91f4b55b15f") (revision "0")) (package (name "tissue") @@ -45,18 +45,34 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0g2f4y6x8wam5367cfpd00nm0swnk3b33rgwcs3rl0cxn2hvj610")))) + "196v0pchpv453z592d82hck4zv8wc6frl7f3sxrph1kgw9mipr1m")))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "prefix=" %output) "GUILE_AUTO_COMPILE=0") + #:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs #:allow-other-keys) (substitute* (list "bin/tissue" "tissue/issue.scm" "tissue/web.scm") (("\"git\"") - (string-append "\"" (assoc-ref inputs "git-minimal") "/bin/git\"")))))))) + (string-append "\"" (assoc-ref inputs "git-minimal") "/bin/git\""))))) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (effective-version (target-guile-effective-version))) + (wrap-program (string-append out "/bin/tissue") + `("GUILE_LOAD_PATH" prefix + (,(string-append out "/share/guile/site/" effective-version) + ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out "/lib/guile/" effective-version "/site-ccache") + ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) (inputs (list git-minimal guile-3.0)) (propagated-inputs (list skribilo-with-gemtext-reader)) -- cgit v1.2.3