diff options
| -rw-r--r-- | gn/packages/gemini.scm | 63 |
1 files changed, 29 insertions, 34 deletions
diff --git a/gn/packages/gemini.scm b/gn/packages/gemini.scm index 1d7939f..96eb653 100644 --- a/gn/packages/gemini.scm +++ b/gn/packages/gemini.scm @@ -2,9 +2,10 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages gettext) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module ((gnu packages skribilo) #:prefix guix:) - #:use-module (gnu packages version-control) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:)) @@ -32,7 +33,7 @@ ,@(package-native-inputs guix:skribilo)))))) (define-public tissue - (let ((commit "85811ab5e6dfbfbcd772eba8a2219061db4c3991") + (let ((commit "983fc85243a5b914cc2fbfaee60e0e1e6ef0b614") (revision "0")) (package (name "tissue") @@ -45,40 +46,34 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1wmdrv0lr7s96nm1invf4gc6c1fq1y1mfgqxy6l0h32fh5sx87gq")))) + "1vrmai1bh307hshd7ch4yp6fhnmafl1g4f34gld5whp85lbfchkk")))) (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 'patch-source-shebangs - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "bin/tissue" - (("^exec guile") - (string-append "exec " (assoc-ref inputs "guile") "/bin/guile"))))) - (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (list "bin/tissue" "tissue/git.scm" "tissue/issue.scm") - (("\"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)) + (list #:make-flags #~(list (string-append "prefix=" #$output)) + #:modules `(((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:phases + (with-imported-modules '((guix build guile-build-system)) + #~(modify-phases %standard-phases + (replace 'patch-source-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bin/tissue" + (("^exec guile") + (string-append "exec " (search-input-file inputs "/bin/guile")))))) + (delete 'configure) + (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 guile-3.0 guile-git guile-xapian)) (propagated-inputs (list skribilo-latest)) (home-page "https://tissue.systemreboot.net") |