nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: artanis: Make some improvements. 

* gnu/packages/guile-xyz.scm (artanis): Remove a tab character by the
revision.
[arguments]: Patch the site-dir for the help command, to make it work. Wrap
the art command such that it finds guile-json and guile-redis.
This commit is contained in:
Christopher Baines 2019-02-04 23:43:45 +00:00
parent 16bb27f281
commit fd9a6d83c2
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/guile-xyz.scm
View File

@ -85,7 +85,7 @@
(define-public artanis (define-public artanis
(let ((release "0.3.1") (let ((release "0.3.1")
(revision 0)) (revision 0))
(package (package
(name "artanis") (name "artanis")
(version (if (zero? revision) (version (if (zero? revision)
@ -152,6 +152,13 @@
#:test-target "test" #:test-target "test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-site-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "artanis/commands/help.scm"
(("\\(%site-dir\\)")
(string-append "\""
(assoc-ref outputs "out")
"/share/guile/site/2.2\"")))))
(add-before 'install 'substitute-root-dir (add-before 'install 'substitute-root-dir
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -162,14 +169,16 @@
(mkdir-p (string-append out "/bin")) ;for the `art' executable (mkdir-p (string-append out "/bin")) ;for the `art' executable
#t))) #t)))
(add-after 'install 'wrap-art (add-after 'install 'wrap-art
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(scm (string-append out "/share/guile/site/2.2")) (scm (string-append out "/share/guile/site/2.2"))
(go (string-append out "/lib/guile/2.2/site-ccache"))) (go (string-append out "/lib/guile/2.2/site-ccache")))
(wrap-program (string-append bin "/art") (wrap-program (string-append bin "/art")
`("GUILE_LOAD_PATH" ":" prefix (,scm)) `("GUILE_LOAD_PATH" ":" prefix
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go))) (,scm ,(getenv "GUILE_LOAD_PATH")))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))
#t)))))) #t))))))
(synopsis "Web application framework written in Guile") (synopsis "Web application framework written in Guile")
(description "GNU Artanis is a web application framework written in Guile (description "GNU Artanis is a web application framework written in Guile