From 11a4c057c4c721f5f602a42ca2025004de4e7436 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 20 Oct 2023 00:12:53 -0400
Subject: [PATCH] gnu: udisks: Make bash-minimal input unconditional.

* gnu/packages/freedesktop.scm (udisks): Normalize comments indentation.
[inputs]: Make bash-minimal unconditional.

Change-Id: I68994658a4a4f8e097744107177f33d81d1c7e1e
---
 gnu/packages/freedesktop.scm | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a94f36e4ee..fc24203cf1 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1733,40 +1733,37 @@ (define-public udisks
                 "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list docbook-xml-4.3 ; to build the manpages
+     (list docbook-xml-4.3              ; to build the manpages
            docbook-xsl
-           `(,glib "bin")  ; for glib-mkenums
-           gnome-common    ; TODO: Why is this needed?
+           `(,glib "bin")               ; for glib-mkenums
+           gnome-common                 ; TODO: Why is this needed?
            gobject-introspection
            gtk-doc/stable
            intltool
            pkg-config
            libxslt))
     (propagated-inputs
-     (list glib)) ; required by udisks2.pc
+     (list glib))                       ; required by udisks2.pc
     (inputs
-     `(,acl
-       ;; TODO(staging): Make unconditional.
-       ,@(if (%current-target-system)
-             (list bash-minimal) ; for wrap-program
-             '())
-       ,cryptsetup
-       ,libatasmart
-       ,libblockdev
-       ,libgudev
-       ,polkit
-       ,util-linux))
+     (list acl
+           bash-minimal
+           cryptsetup
+           libatasmart
+           libblockdev
+           libgudev
+           polkit
+           util-linux))
     (outputs '("out"
-               "doc"))                            ;5 MiB of gtk-doc HTML
+               "doc"))                  ;5 MiB of gtk-doc HTML
     (arguments
      (list
-      #:tests? #f ; requiring system message dbus
-      #:disallowed-references '("doc")            ;enforce separation of "doc"
+      #:tests? #f                       ; requiring system message dbus
+      #:disallowed-references '("doc")  ;enforce separation of "doc"
       #:configure-flags
       #~(list "--enable-man"
               "--enable-available-modules" ; Such as lvm2, btrfs, etc.
               "--localstatedir=/var"
-              "--enable-fhs-media"     ;mount devices in /media, not /run/media
+              "--enable-fhs-media"    ;mount devices in /media, not /run/media
               (string-append "--with-html-dir=" #$output:doc
                              "/share/doc/udisks/html")
               (string-append "--with-udevdir=" #$output "/lib/udev"))