ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openssh: Use invoke.

Browse source 
* gnu/packages/ssh.scm (openssh)[arguments]: Use invoke and remove vestigial
plumbing in the custom install phase.
This commit is contained in:
Mark H Weaver 2018-03-23 03:30:00 -04:00
parent 4530e854f1
commit 27b6adb715
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/ssh.scm
View file

@ -184,8 +184,7 @@ (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/"))
@ -194,7 +193,7 @@ (define-public openssh
(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