From 01e12448b31bf54bebc473605ca4b38e179e7730 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@tutanota.com>
Date: Fri, 14 Jan 2022 17:05:19 -0500
Subject: [PATCH 2/2] gnu: flatpak: Simplify inputs.

* gnu/packages/package-management.scm (flatpak)[native-inputs, inputs]: Remove labels.
[arguments]<#:phases>: Edit 'p11-kit-fix to use p11-kit instead of
p11-kit-next.
---
 gnu/packages/package-management.scm | 58 ++++++++++++++---------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 9e37c44fdd..0cf6344cab 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1808,7 +1808,7 @@ (define-public flatpak
             #t))
         (add-after 'unpack 'p11-kit-fix
           (lambda* (#:key inputs #:allow-other-keys)
-            (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next")
+            (let ((p11-path (string-append (assoc-ref inputs "p11-kit")
                                            "/bin/p11-kit")))
               (substitute* "session-helper/flatpak-session-helper.c"
                 (("\"p11-kit\",")
@@ -1824,37 +1824,37 @@ (define-public flatpak
             (invoke "make" "check"
                     "TESTS=tests/test-basic.sh tests/test-config.sh testcommon"))))))
     (native-inputs
-    `(("bison" ,bison)
-      ("dbus" ,dbus) ; for dbus-daemon
-      ("gettext" ,gettext-minimal)
-      ("glib:bin" ,glib "bin")          ; for glib-mkenums + gdbus-codegen
-      ("glibc-utf8-locales" ,glibc-utf8-locales)
-      ("gobject-introspection" ,gobject-introspection)
-      ("libcap" ,libcap)
-      ("pkg-config" ,pkg-config)
-      ("python" ,python)
-      ("python-pyparsing" ,python-pyparsing)
-      ("socat" ,socat)
-      ("which" ,which)))
+     (list bison
+           dbus ; for dbus-daemon
+           gettext-minimal
+           `(,glib "bin") ; for glib-mkenums + gdbus-codegen
+           glibc-utf8-locales
+           gobject-introspection
+           libcap
+           pkg-config
+           python
+           python-pyparsing
+           socat
+           which))
    (propagated-inputs (list glib-networking gnupg-2.2.32
                             gsettings-desktop-schemas))
    (inputs
-    `(("appstream-glib" ,appstream-glib)
-      ("bubblewrap" ,bubblewrap)
-      ("dconf" ,dconf)
-      ("fuse" ,fuse)
-      ("gdk-pixbuf" ,gdk-pixbuf)
-      ("gpgme" ,gpgme)
-      ("json-glib" ,json-glib)
-      ("libarchive" ,libarchive)
-      ("libostree" ,libostree)
-      ("libseccomp" ,libseccomp)
-      ("libsoup" ,libsoup-minimal-2)
-      ("libxau" ,libxau)
-      ("libxml2" ,libxml2)
-      ("p11-kit-next" ,p11-kit-next)
-      ("util-linux" ,util-linux)
-      ("xdg-dbus-proxy" ,xdg-dbus-proxy)))
+    (list appstream-glib
+          bubblewrap
+          dconf
+          fuse
+          gdk-pixbuf
+          gpgme
+          json-glib
+          libarchive
+          libostree
+          libseccomp
+          libsoup-minimal-2
+          libxau
+          libxml2
+          p11-kit-next
+          util-linux
+          xdg-dbus-proxy))
    (home-page "https://flatpak.org")
    (synopsis "System for building, distributing, and running sandboxed desktop
 applications")
-- 
2.34.1