gnu: openssh: Allow store-prefixed ssh-agent providers.

* gnu/packages/ssh.scm (openssh)[arguments]<#:phases>{set-store-location}:
Extend phase and rename it to...
* {set-store-location}: ...this.

Fixes: guix/guix#10224

1 files changed, 6 insertions, 2 deletions

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 82d62e40a65..35a2da50445 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -284,11 +284,15 @@ a server that supports the SSH-2 protocol.")
                #~()))
      #:phases
      #~(modify-phases %standard-phases
-         (add-after 'configure 'set-store-location
+         (add-after 'configure 'trust-store-location
            (lambda _
              (substitute* "misc.c"
                (("@STORE_DIRECTORY@")
-                (string-append "\"" (%store-directory) "/\"")))))
+                (string-append "\"" (%store-directory) "/\"")))
+             (substitute* "ssh-agent.c"
+               (("DEFAULT_ALLOWED_PROVIDERS \"")
+                (string-append "DEFAULT_ALLOWED_PROVIDERS "
+                               "\"" (%store-directory) "/**/lib*/*,")))))
          (add-before 'check 'patch-tests
            (lambda _
              (substitute* "regress/test-exec.sh"