[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/18: gnu: guile-ssh: Return #t from all phases.
From: |
Tobias Geerinckx-Rice |
Subject: |
05/18: gnu: guile-ssh: Return #t from all phases. |
Date: |
Fri, 22 Jun 2018 17:22:17 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit e7c37ed590cad02d4d2f0e86ce5fcb3f15c69fb8
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Jun 22 21:35:48 2018 +0200
gnu: guile-ssh: Return #t from all phases.
* gnu/packages/ssh.scm (guile-ssh)[arguments]: Substitute INVOKE for
SYSTEM* and all its trappings.
---
gnu/packages/ssh.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index dd85180..6a690c7 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -256,22 +256,22 @@ Additionally, various channel-specific options can be
negotiated.")
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'autoreconf
(lambda* (#:key inputs #:allow-other-keys)
- (zero? (system* "autoreconf" "-vfi"))))
+ (invoke "autoreconf" "-vfi")))
(add-before 'build 'fix-libguile-ssh-file-name
(lambda* (#:key outputs #:allow-other-keys)
;; Build and install libguile-ssh.so so that we can use
;; its absolute file name in .scm files, before we build
;; the .go files.
- (and (zero? (system* "make" "install"
- "-C" "libguile-ssh"
- "-j" (number->string
- (parallel-job-count))))
- (let* ((out (assoc-ref outputs "out"))
- (libdir (string-append out "/lib")))
- (substitute* (find-files "." "\\.scm$")
- (("\"libguile-ssh\"")
- (string-append "\"" libdir "/libguile-ssh\"")))
- #t))))
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib")))
+ (invoke "make" "install"
+ "-C" "libguile-ssh"
+ "-j" (number->string
+ (parallel-job-count)))
+ (substitute* (find-files "." "\\.scm$")
+ (("\"libguile-ssh\"")
+ (string-append "\"" lib "/libguile-ssh\"")))
+ #t)))
(add-after 'install 'remove-bin-directory
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- branch master updated (71d4ba5 -> 1829f7e), Tobias Geerinckx-Rice, 2018/06/22
- 01/18: gnu: lxc: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/22
- 02/18: gnu: git-crypt: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 03/18: gnu: qemu: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/22
- 05/18: gnu: guile-ssh: Return #t from all phases.,
Tobias Geerinckx-Rice <=
- 06/18: gnu: corkscrew: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 08/18: gnu: corkscrew: Clean up dead code., Tobias Geerinckx-Rice, 2018/06/22
- 07/18: gnu: corkscrew: Deduplicate documentation directories., Tobias Geerinckx-Rice, 2018/06/22
- 09/18: gnu: busybox: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 04/18: gnu: libtocc: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 10/18: gnu: libgit2: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 13/18: gnu: eid-mw: Don't use unstable tarball., Tobias Geerinckx-Rice, 2018/06/22
- 14/18: gnu: eid-mw: Fix build., Tobias Geerinckx-Rice, 2018/06/22
- 11/18: gnu: Use HTTPS for drobilla.net URIs., Tobias Geerinckx-Rice, 2018/06/22
- 15/18: gnu: eid-mw: Update to 4.4.3., Tobias Geerinckx-Rice, 2018/06/22