mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: openssh: Use invoke.
* gnu/packages/ssh.scm (openssh)[arguments]: Use invoke and remove vestigial plumbing in the custom install phase.
This commit is contained in:
parent
4530e854f1
commit
27b6adb715
1 changed files with 10 additions and 11 deletions
|
@ -184,17 +184,16 @@ (define-public openssh
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
|
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
|
||||||
;; install without host keys and system configuration files
|
;; install without host keys and system configuration files
|
||||||
(and (zero? (apply system* "make" "install-nosysconf" make-flags))
|
(apply invoke "make" "install-nosysconf" make-flags)
|
||||||
(begin
|
(install-file "contrib/ssh-copy-id"
|
||||||
(install-file "contrib/ssh-copy-id"
|
(string-append (assoc-ref outputs "out")
|
||||||
(string-append (assoc-ref outputs "out")
|
"/bin/"))
|
||||||
"/bin/"))
|
(chmod (string-append (assoc-ref outputs "out")
|
||||||
(chmod (string-append (assoc-ref outputs "out")
|
"/bin/ssh-copy-id") #o555)
|
||||||
"/bin/ssh-copy-id") #o555)
|
(install-file "contrib/ssh-copy-id.1"
|
||||||
(install-file "contrib/ssh-copy-id.1"
|
(string-append (assoc-ref outputs "out")
|
||||||
(string-append (assoc-ref outputs "out")
|
"/share/man/man1/"))
|
||||||
"/share/man/man1/"))
|
#t)))))
|
||||||
#t)))))))
|
|
||||||
(synopsis "Client and server for the secure shell (ssh) protocol")
|
(synopsis "Client and server for the secure shell (ssh) protocol")
|
||||||
(description
|
(description
|
||||||
"The SSH2 protocol implemented in OpenSSH is standardised by the
|
"The SSH2 protocol implemented in OpenSSH is standardised by the
|
||||||
|
|
Loading…
Reference in a new issue