gnu: openssh: Remove empty /var/empty.

* gnu/packages/ssh.scm (openssh)[arguments]: Delete /var/empty after
‘make install’.  Make the rest less repetitive—no functional changes.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-04 02:06:49 +02:00
parent 3235a54cd7
commit ec7bcdc35a
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -257,16 +257,18 @@ (define-public openssh
(string-append pre post))))) (string-append pre post)))))
(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" (with-directory-excursion out
(string-append (assoc-ref outputs "out") (rmdir "var/empty")
"/bin/")) (rmdir "var"))
(chmod (string-append (assoc-ref outputs "out") (with-directory-excursion "contrib"
"/bin/ssh-copy-id") #o555) (chmod "ssh-copy-id" #o555)
(install-file "contrib/ssh-copy-id.1" (install-file "ssh-copy-id"
(string-append (assoc-ref outputs "out") (string-append out "/bin/"))
"/share/man/man1/"))))))) (install-file "ssh-copy-id.1"
(string-append out "/share/man/man1/")))))))))
(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