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

gnu: guile-wisp: Simplify arguments and fix indentation. 

* gnu/packages/guile.scm (guile-wisp)[arguments]: Slightly simplify and fix
indentation.
This commit is contained in:
Ricardo Wurmus 2019-01-23 12:26:48 +01:00
parent ef841dca91
commit a38fa63b4b
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/guile.scm
View File

@ -1303,28 +1303,19 @@ key-value cache and store.")
(guix build utils) (guix build utils)
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 popen)) (ice-9 popen))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'substitute-before-config (add-before 'configure 'patch-/usr/bin/env
(lambda _
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
;; Puts together some test files with /bin/bash hardcoded
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("/usr/bin/env bash") (("/usr/bin/env bash") (which "bash"))
(string-append bash "/bin/bash"))
(("\\$\\(GUILE_EFFECTIVE_VERSION\\)/site") (("\\$\\(GUILE_EFFECTIVE_VERSION\\)/site")
"site/$(GUILE_EFFECTIVE_VERSION)")) ;use the right order "site/$(GUILE_EFFECTIVE_VERSION)")) ;use the right order
#t))) #t))
;; auto compilation breaks, but if we set HOME to /tmp, ;; auto compilation breaks, but if we set HOME to /tmp,
;; that works ok ;; that works ok
(add-before (add-before 'check 'auto-compile-hacky-workaround
'check 'auto-compile-hacky-workaround (lambda _ (setenv "HOME" "/tmp") #t))
(lambda _
(setenv "HOME" "/tmp")
#t))
(add-after 'install 'install-go-files (add-after 'install 'install-go-files
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))