From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 71327@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#71327] [PATCH 6/8] gnu: udisks: Remove input labels.
Date: Mon, 3 Jun 2024 08:02:54 -0400 [thread overview]
Message-ID: <f718ea416a61af5219f71b4ef608a7089c8109a7.1717382584.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com>
* gnu/packages/freedesktop.scm (udisks) [native-inputs]: Remove input labels.
[phases]: Remove trailing #t.
Change-Id: I805df6ac2e5ad96cf7a092d34354aefb12bd7586
---
gnu/packages/freedesktop.scm | 67 +++++++++++++++++-------------------
1 file changed, 31 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6941450436..bb0858cd9e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
-;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@@ -1732,34 +1732,31 @@ (define-public udisks
"06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj"))))
(build-system gnu-build-system)
(native-inputs
- `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages
- ("docbook-xsl" ,docbook-xsl)
- ("glib:bin" ,glib "bin") ; for glib-mkenums
- ("gnome-common" ,gnome-common) ; TODO: Why is this needed?
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
- ("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
- ("xsltproc" ,libxslt)))
+ (list docbook-xml-4.3 ; to build the manpages
+ docbook-xsl
+ `(,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
- `(#: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.
@@ -1786,15 +1783,14 @@ (define-public udisks
docbook-xml-catalog-file)))
#:phases
(modify-phases %standard-phases
- (add-before
- 'configure 'fix-girdir
- (lambda _
- ;; Install introspection data to its own output.
- (substitute* "udisks/Makefile.in"
- (("girdir = .*")
- "girdir = $(datadir)/gir-1.0\n")
- (("typelibsdir = .*")
- "typelibsdir = $(libdir)/girepository-1.0\n"))))
+ (add-before 'configure 'fix-girdir
+ (lambda _
+ ;; Install introspection data to its own output.
+ (substitute* "udisks/Makefile.in"
+ (("girdir = .*")
+ "girdir = $(datadir)/gir-1.0\n")
+ (("typelibsdir = .*")
+ "typelibsdir = $(libdir)/girepository-1.0\n"))))
(add-after 'install 'wrap-udisksd
(lambda* (#:key outputs inputs #:allow-other-keys)
;; Tell 'udisksd' where to find the 'mount' command.
@@ -1809,8 +1805,7 @@ (define-public udisks
;; partitions, e.g. in gnome-disks
,(string-append cryptsetup "/sbin")
"/run/current-system/profile/bin"
- "/run/current-system/profile/sbin")))
- #t))))))
+ "/run/current-system/profile/sbin")))))))))
(home-page "https://www.freedesktop.org/wiki/Software/udisks/")
(synopsis "Disk manager service")
(description
--
2.45.1
next prev parent reply other threads:[~2024-06-03 12:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 2:43 [bug#71327] [PATCH 1/8] gnu: libbytesize: Update to 2.10 Maxim Cournoyer
2024-06-03 12:02 ` [bug#71327] [PATCH 2/8] gnu: libblockdev: Embed executable paths Maxim Cournoyer
2024-06-03 12:02 ` [bug#71327] [PATCH 3/8] gnu: libblockdev: Fix inputs Maxim Cournoyer
2024-06-03 12:02 ` [bug#71327] [PATCH 4/8] gnu: libblockdev: Update to 3.1.1 Maxim Cournoyer
2024-06-03 12:02 ` [bug#71327] [PATCH 5/8] gnu: libblockdev: Use gexps Maxim Cournoyer
2024-06-03 12:02 ` Maxim Cournoyer [this message]
2024-06-03 12:02 ` [bug#71327] [PATCH 7/8] gnu: udisks: Update to 2.10.1 Maxim Cournoyer
2024-06-03 12:02 ` [bug#71327] [PATCH 8/8] gnu: udisks: Remove obsolete wrap-udisksd phase Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f718ea416a61af5219f71b4ef608a7089c8109a7.1717382584.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=71327@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).