aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGábor Boskovits <boskovits@gmail.com>2019-02-25 12:31:40 +0100
committerGábor Boskovits <boskovits@gmail.com>2019-02-26 23:02:24 +0100
commit618631f3683e7caf5b0336ce06abf62a25ce119b (patch)
treed6720522de3ada9f9ba4e832e195df4c4c3dd71b
parent35aa016af104567a6632abdbad72e5fd3de8e2ca (diff)
downloadguix-618631f3683e7caf5b0336ce06abf62a25ce119b.tar
guix-618631f3683e7caf5b0336ce06abf62a25ce119b.tar.gz
gnu: openssh: Add libedit support.
* gnu/packages/ssh.scm (openssh)[native-inputs]: Add pkg-config. [inputs]: Add libedit. [arguments](configure-flags): Add --with-libedit.
-rw-r--r--gnu/packages/ssh.scm11
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 1928ea7634..968118ad19 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2018 Manuel Graf <graf@init.at>
+;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,6 +40,7 @@
#:use-module (gnu packages gperf)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
+ #:use-module (gnu packages libedit)
#:use-module (gnu packages linux)
#:use-module (gnu packages logging)
#:use-module (gnu packages m4)
@@ -154,8 +156,10 @@ a server that supports the SSH-2 protocol.")
(base32
"1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"))))
(build-system gnu-build-system)
- (native-inputs `(("groff" ,groff)))
- (inputs `(("openssl" ,openssl)
+ (native-inputs `(("groff" ,groff)
+ ("pkg-config" ,pkg-config)))
+ (inputs `(("libedit" ,libedit)
+ ("openssl" ,openssl)
("pam" ,linux-pam)
("mit-krb5" ,mit-krb5)
("zlib" ,zlib)
@@ -175,6 +179,9 @@ a server that supports the SSH-2 protocol.")
(assoc-ref %build-inputs "mit-krb5")
"/bin")
+ ;; libedit needed for sftp completion
+ "--with-libedit"
+
;; Enable PAM support in sshd.
"--with-pam")