07/10: gnu: flatpak: Fix certificate error from p11-kit.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit d407c107f363c36feecbf1d55735479add59d799
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Fri Oct 8 14:54:46 2021 -0400

    gnu: flatpak: Fix certificate error from p11-kit.
    
    * gnu/packages/package-management.scm (flatpak)[inputs]: Add p11-kit-next.
    [arguments]: Add new 'p11-kit-fix phase to patch source to use p11-kit-next
    input instead of an implicit p11-kit from dependencies.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/package-management.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 6530978..e8f8ee1 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1565,6 +1565,16 @@ cp -r /tmp/locale/*/en_US.*")))
               (("/bin/kill") (which "kill"))
               (("/usr/bin/python3") (which "python3")))
             #t))
+        (add-after 'unpack 'p11-kit-fix
+          (lambda* (#:key inputs #:allow-other-keys)
+            (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next")
+                                           "/bin/p11-kit")))
+              (substitute* "session-helper/flatpak-session-helper.c"
+                (("\"p11-kit\",")
+                 (string-append "\"" p11-path "\","))
+                (("if \\(g_find_program_in_path \\(\"p11-kit\"\\)\\)")
+                 (string-append "if (g_find_program_in_path (\""
+                                p11-path "\"))"))))))
         ;; Many tests fail for unknown reasons, so we just run a few basic
         ;; tests.
         (replace 'check
@@ -1603,6 +1613,7 @@ cp -r /tmp/locale/*/en_US.*")))
       ("libsoup" ,libsoup)
       ("libxau" ,libxau)
       ("libxml2" ,libxml2)
+      ("p11-kit-next" ,p11-kit-next)
       ("util-linux" ,util-linux)
       ("xdg-dbus-proxy" ,xdg-dbus-proxy)))
    (home-page "https://flatpak.org";)