diff mbox series

[bug#71897,v9,2/8] gnu: xdg-desktop-portal: Improve style.

Message ID 7648e29926885f068cade00966b625e2e0932061.1727004999.git.i@dan.games
State New
Headers show
Series [bug#71897,v9,1/8] gnu: xdg-desktop-portal: Update to 1.18.4. | expand

Commit Message

dan Sept. 22, 2024, 11:37 a.m. UTC
From: Liliana Marie Prikler <liliana.prikler@gmail.com>

* gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after
arguments.  Drop labels.
[native-inputs]: Move after inputs.  Drop labels.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/freedesktop.scm | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index f00f4b3956..664adf0cb2 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3001,26 +3001,6 @@  (define-public xdg-desktop-portal
        ;; Disable portal tests since they try to use fuse.
        (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch"))))
     (build-system meson-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("glib:bin" ,glib "bin")
-       ("gettext" ,gettext-minimal)
-       ("python" ,python)
-       ("python-dbusmock" ,python-dbusmock)
-       ("python-pytest" ,python-pytest)
-       ("python-pytest-xdist" ,python-pytest-xdist)))
-    (inputs
-     `(("bubblewrap" ,bubblewrap)
-       ("gdk-pixbuf" ,gdk-pixbuf)
-       ("glib" ,glib)
-       ("flatpak" ,flatpak)
-       ("fontconfig" ,fontconfig)
-       ("json-glib" ,json-glib)
-       ("libportal" ,libportal)
-       ("dbus" ,dbus)
-       ("geoclue" ,geoclue)
-       ("pipewire" ,pipewire)
-       ("fuse" ,fuse)))
     (arguments
      `(#:configure-flags
        (list "-Dsystemd=disabled")
@@ -3034,6 +3014,26 @@  (define-public xdg-desktop-portal
                        (find-files "po" "\\.po$"))))
          (add-after 'unpack 'set-home-directory
            (lambda _ (setenv "HOME" "/tmp"))))))
+    (inputs
+     (list bubblewrap
+           dbus
+           flatpak
+           fontconfig
+           fuse
+           gdk-pixbuf
+           geoclue
+           glib
+           json-glib
+           libportal
+           pipewire))
+    (native-inputs
+     (list gettext-minimal
+           `(,glib "bin")
+           pkg-config
+           python
+           python-dbusmock
+           python-pytest
+           python-pytest-xdist))
     (native-search-paths
      (list (search-path-specification
             (variable "XDG_DESKTOP_PORTAL_DIR")