nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: openssh: Clean-up custom install phase. 

* gnu/packages/ssh.scm (openssh)[arguments]: Factor out outputs in
custom 'install phase to clean-up code.
This commit is contained in:
Efraim Flashner 2019-06-25 19:31:13 +03:00
parent 46475f72ab
commit 7754136e46
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/ssh.scm
View File

@ -220,20 +220,17 @@ a server that supports the SSH-2 protocol.")
#t)) #t))
(replace 'install (replace 'install
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys) (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; install without host keys and system configuration files ;; install without host keys and system configuration files
(apply invoke "make" "install-nosysconf" make-flags) (apply invoke "make" "install-nosysconf" make-flags)
(install-file "contrib/ssh-copy-id" (install-file "contrib/ssh-copy-id"
(string-append (assoc-ref outputs "out") (string-append out "/bin/"))
"/bin/")) (chmod (string-append out "/bin/ssh-copy-id") #o555)
(chmod (string-append (assoc-ref outputs "out")
"/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 out "/share/man/man1/"))
"/share/man/man1/"))
;; Don't install the PRIVSEP_PATH directory. ;; Don't install the PRIVSEP_PATH directory.
(delete-file-recursively (delete-file-recursively (string-append out "/var"))
(string-append (assoc-ref outputs "out") "/var")) #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