diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-20 00:12:53 -0400 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:27 +0200 |
commit | 11a4c057c4c721f5f602a42ca2025004de4e7436 (patch) | |
tree | 93d4aae06334937167a2b2bd603a7146501c58a0 /gnu/packages/freedesktop.scm | |
parent | eb4c2f63f6cf84b040f20bf1dd081f8208e0dbe8 (diff) | |
download | guix-11a4c057c4c721f5f602a42ca2025004de4e7436.tar.gz guix-11a4c057c4c721f5f602a42ca2025004de4e7436.zip |
gnu: udisks: Make bash-minimal input unconditional.
* gnu/packages/freedesktop.scm (udisks): Normalize comments indentation.
[inputs]: Make bash-minimal unconditional.
Change-Id: I68994658a4a4f8e097744107177f33d81d1c7e1e
Diffstat (limited to 'gnu/packages/freedesktop.scm')
-rw-r--r-- | gnu/packages/freedesktop.scm | 35 |
1 files 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 @@ Analysis and Reporting Technology) functionality.") "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")) |