me
/
guix
Archived
1
0
Fork 0
Code

gnu: openssh: Use invoke. 

* gnu/packages/ssh.scm (openssh)[arguments]: Use invoke and remove vestigial
plumbing in the custom install phase.
master
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

21
gnu/packages/ssh.scm
View File

@ -184,17 +184,16 @@ a server that supports the SSH-2 protocol.")
(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