diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2021-10-08 14:54:46 -0400 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-10-25 21:01:20 +0200 |
| commit | d407c107f363c36feecbf1d55735479add59d799 (patch) | |
| tree | 4380d87e166a7be995f7b95e7103aa5febf23efa /gnu/packages/package-management.scm | |
| parent | 73a795e77cc422e569c7e96057be43cdf1b909bf (diff) | |
| download | guix-patches-d407c107f363c36feecbf1d55735479add59d799.tar guix-patches-d407c107f363c36feecbf1d55735479add59d799.tar.gz | |
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>
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6530978c34..e8f8ee1ce7 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") |