TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

21
gnu/packages/ssh.scm
View file

@ -184,17 +184,16 @@ (define-public openssh
(replace 'install
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
;; install without host keys and system configuration files
(and (zero? (apply system* "make" "install-nosysconf" make-flags))
(begin
(install-file "contrib/ssh-copy-id"
(string-append (assoc-ref outputs "out")
"/bin/"))
(chmod (string-append (assoc-ref outputs "out")
"/bin/ssh-copy-id") #o555)
(install-file "contrib/ssh-copy-id.1"
(string-append (assoc-ref outputs "out")
"/share/man/man1/"))
#t)))))))
(apply invoke "make" "install-nosysconf" make-flags)
(install-file "contrib/ssh-copy-id"
(string-append (assoc-ref outputs "out")
"/bin/"))
(chmod (string-append (assoc-ref outputs "out")
"/bin/ssh-copy-id") #o555)
(install-file "contrib/ssh-copy-id.1"
(string-append (assoc-ref outputs "out")
"/share/man/man1/"))
#t)))))
(synopsis "Client and server for the secure shell (ssh) protocol")
(description
"The SSH2 protocol implemented in OpenSSH is standardised by the