aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/guile.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-01-23 12:26:48 +0100
committerRicardo Wurmus <rekado@elephly.net>2019-01-23 12:27:40 +0100
commita38fa63b4b13ea6f4f3986a78060cf0b5d852170 (patch)
treec49c71fa4da916000e1592e0aa59090aa1571f77 /gnu/packages/guile.scm
parentef841dca911b9bbc959080a7bb5609db7a1a31f2 (diff)
downloadguix-a38fa63b4b13ea6f4f3986a78060cf0b5d852170.tar
guix-a38fa63b4b13ea6f4f3986a78060cf0b5d852170.tar.gz
gnu: guile-wisp: Simplify arguments and fix indentation.
* gnu/packages/guile.scm (guile-wisp)[arguments]: Slightly simplify and fix indentation.
Diffstat (limited to 'gnu/packages/guile.scm')
-rw-r--r--gnu/packages/guile.scm67
1 files changed, 29 insertions, 38 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e38d00696f..98221a83eb 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1303,49 +1303,40 @@ key-value cache and store.")
(guix build utils)
(ice-9 rdelim)
(ice-9 popen))
-
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'substitute-before-config
-
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash")))
- ;; Puts together some test files with /bin/bash hardcoded
- (substitute* "Makefile.in"
- (("/usr/bin/env bash")
- (string-append bash "/bin/bash"))
- (("\\$\\(GUILE_EFFECTIVE_VERSION\\)/site")
- "site/$(GUILE_EFFECTIVE_VERSION)")) ;use the right order
- #t)))
-
+ (add-before 'configure 'patch-/usr/bin/env
+ (lambda _
+ (substitute* "Makefile.in"
+ (("/usr/bin/env bash") (which "bash"))
+ (("\\$\\(GUILE_EFFECTIVE_VERSION\\)/site")
+ "site/$(GUILE_EFFECTIVE_VERSION)")) ;use the right order
+ #t))
;; auto compilation breaks, but if we set HOME to /tmp,
;; that works ok
- (add-before
- 'check 'auto-compile-hacky-workaround
- (lambda _
- (setenv "HOME" "/tmp")
- #t))
+ (add-before 'check 'auto-compile-hacky-workaround
+ (lambda _ (setenv "HOME" "/tmp") #t))
(add-after 'install 'install-go-files
- (lambda* (#:key outputs inputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (effective (read-line
- (open-pipe* OPEN_READ
- "guile" "-c"
- "(display (effective-version))")))
- (module-dir (string-append out "/share/guile/site/"
- effective))
- (object-dir (string-append out "/lib/guile/" effective
- "/site-ccache"))
- (prefix (string-length module-dir)))
- ;; compile to the destination
- (for-each (lambda (file)
- (let* ((base (string-drop (string-drop-right file 4)
- prefix))
- (go (string-append object-dir base ".go")))
- (invoke "guild" "compile" "-L" module-dir
- file "-o" go)))
- (find-files module-dir "\\.scm$"))
- #t))))))
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (effective (read-line
+ (open-pipe* OPEN_READ
+ "guile" "-c"
+ "(display (effective-version))")))
+ (module-dir (string-append out "/share/guile/site/"
+ effective))
+ (object-dir (string-append out "/lib/guile/" effective
+ "/site-ccache"))
+ (prefix (string-length module-dir)))
+ ;; compile to the destination
+ (for-each (lambda (file)
+ (let* ((base (string-drop (string-drop-right file 4)
+ prefix))
+ (go (string-append object-dir base ".go")))
+ (invoke "guild" "compile" "-L" module-dir
+ file "-o" go)))
+ (find-files module-dir "\\.scm$"))
+ #t))))))
(home-page "https://draketo.de/english/wisp")
(inputs
`(("guile" ,guile-2.2)))