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

Revert "gnu: openssh: Clean-up custom install phase." 

This reverts commit 7754136e46.
This commit is contained in:
Tobias Geerinckx-Rice 2019-06-27 00:20:50 +02:00
parent cac6c3bad5
commit 1ebb908d44
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/ssh.scm
View File

@ -220,17 +220,20 @@ 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 out "/bin/")) (string-append (assoc-ref outputs "out")
(chmod (string-append out "/bin/ssh-copy-id") #o555) "/bin/"))
(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 out "/share/man/man1/")) (string-append (assoc-ref outputs "out")
"/share/man/man1/"))
;; Don't install the PRIVSEP_PATH directory. ;; Don't install the PRIVSEP_PATH directory.
(delete-file-recursively (string-append out "/var")) (delete-file-recursively
#t)))))) (string-append (assoc-ref outputs "out") "/var"))
#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