me
/
guix
Archived
1
0
Fork 0
Code

gnu: guile-ssh: Return #t from all phases. 

* gnu/packages/ssh.scm (guile-ssh)[arguments]: Substitute INVOKE for
SYSTEM* and all its trappings.
master
Tobias Geerinckx-Rice 2018-06-22 21:35:48 +02:00
parent 9947dcd746
commit e7c37ed590
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/ssh.scm
View File

@ -256,22 +256,22 @@ Additionally, various channel-specific options can be negotiated.")
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-after 'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(zero? (system* "autoreconf" "-vfi")))) (invoke "autoreconf" "-vfi")))
(add-before 'build 'fix-libguile-ssh-file-name (add-before 'build 'fix-libguile-ssh-file-name
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Build and install libguile-ssh.so so that we can use ;; Build and install libguile-ssh.so so that we can use
;; its absolute file name in .scm files, before we build ;; its absolute file name in .scm files, before we build
;; the .go files. ;; the .go files.
(and (zero? (system* "make" "install" (let* ((out (assoc-ref outputs "out"))
"-C" "libguile-ssh" (lib (string-append out "/lib")))
"-j" (number->string (invoke "make" "install"
(parallel-job-count)))) "-C" "libguile-ssh"
(let* ((out (assoc-ref outputs "out")) "-j" (number->string
(libdir (string-append out "/lib"))) (parallel-job-count)))
(substitute* (find-files "." "\\.scm$") (substitute* (find-files "." "\\.scm$")
(("\"libguile-ssh\"") (("\"libguile-ssh\"")
(string-append "\"" libdir "/libguile-ssh\""))) (string-append "\"" lib "/libguile-ssh\"")))
#t)))) #t)))
(add-after 'install 'remove-bin-directory (add-after 'install 'remove-bin-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))