guix_mirror_bot pushed a commit to branch crypto-team
in repository guix.
commit 56c07072f2d258e2ccc786c0a02400efd8851e4a
Author: Yelninei <[email protected]>
AuthorDate: Wed Jun 3 11:01:40 2026 +0000
gnu: openssh: Ungexp conditional configure-flags later.
* gnu/packages/ssh.scm (openssh)[#:configure-flags]: Ungexp the entire
conditional expression instead of only the condition.
Change-Id: I1fac110a4c4a80509cce1f3336af508cf6a40eb3
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/packages/ssh.scm | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index b277218565..6de84231c3 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -256,32 +256,32 @@ a server that supports the SSH-2 protocol.")
#:make-flags
#~(list "REGRESSTMP=\"$${BUILDDIR}/regress\"")
#:configure-flags
- #~(append
- (list "--sysconfdir=/etc/ssh"
- ;; Default value of 'PATH' used by sshd.
- "--with-default-path=/run/current-system/profile/bin"
- ;; configure needs to find krb5-config.
- (string-append "--with-kerberos5="
- #$(this-package-input "mit-krb5")
- "/bin")
- ;; libedit is needed for sftp completion.
- "--with-libedit")
+ #~(list
+ "--sysconfdir=/etc/ssh"
+ ;; Default value of 'PATH' used by sshd.
+ "--with-default-path=/run/current-system/profile/bin"
+ ;; configure needs to find krb5-config.
+ (string-append "--with-kerberos5="
+ #$(this-package-input "mit-krb5")
+ "/bin")
+ ;; libedit is needed for sftp completion.
+ "--with-libedit"
;; Enable PAM support in sshd.
- (if #$(target-hurd?)
- '()
- (list "--with-pam"
+ #$@(if (target-hurd?)
+ #~()
+ #~("--with-pam"
;; Support creation and use of ecdsa-sk, ed25519-sk keys.
"--with-security-key-builtin"))
;; "make install" runs "install -s" by default, which doesn't work for
;; cross-compiled binaries because it invokes 'strip' instead of
;; 'TRIPLET-strip'. Work around this.
- (if #$(%current-target-system)
- (append (list "--disable-strip")
- (let ((xauth #$(this-package-input "xauth")))
- (if xauth
- (list (string-append "--with-xauth=" xauth
"/bin/xauth"))
- '())))
- '()))
+ #$@(if (%current-target-system)
+ #~("--disable-strip"
+ #$@(let ((xauth (this-package-input "xauth")))
+ (if xauth
+ #~((string-append "--with-xauth=" #$xauth
"/bin/xauth"))
+ #~())))
+ #~()))
#:phases
#~(modify-phases %standard-phases
(add-after 'configure 'set-store-location
