ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-24 11:39:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openssh: Remove libfido2 dependency on GNU/Hurd.

Browse source 
* gnu/packages/ssh.scm (openssh)[inputs]: Remove LIBFIDO2 when
'hurd-target?'.
[arguments]: Likewise for "--with-security-key-builtin".
This commit is contained in:
Ludovic Courtès 2021-12-06 10:54:41 +01:00
parent 93e9f0bc7f
commit 9478a25250
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/ssh.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012-2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
@ -200,11 +200,11 @@ (define-public openssh
(native-inputs `(("groff" ,groff)
("pkg-config" ,pkg-config)))
(inputs `(("libedit" ,libedit)
("libfido2" ,libfido2)
("openssl" ,openssl)
,@(if (hurd-target?)
'()
`(("pam" ,linux-pam)))
'()
`(("pam" ,linux-pam)
("libfido2" ,libfido2))) ;fails to build on GNU/Hurd
("mit-krb5" ,mit-krb5)
("zlib" ,zlib)
("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y'
@ -229,10 +229,13 @@ (define-public openssh
;; Enable PAM support in sshd.
,,@(if (hurd-target?)
'()
'("--with-pam"))
'("--with-pam"
;; Support creation and use of ecdsa-sk,
;; ed25519-sk keys.
"--with-security-key-builtin"))
;; supports 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