unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 71327@debbugs.gnu.org
Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com
Subject: [bug#71327] [PATCH v2 7/7] gnu: udisks: Remove obsolete wrap-udisksd phase.
Date: Mon,  7 Oct 2024 22:12:33 +0200	[thread overview]
Message-ID: <20241007201652.15133-8-ngraves@ngraves.fr> (raw)
In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr>

From: Maxim Cournoyer <maxim.cournoyer@gmail.com>

The tools are now patched in the libblockdev plugin sources directly.

* gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd
phase.
---
 gnu/packages/freedesktop.scm | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 14c0482496..0ab0bb5104 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1804,21 +1804,7 @@ (define-public udisks
                 (("girdir = .*")
                  "girdir = $(datadir)/gir-1.0\n")
                 (("typelibsdir = .*")
-                 "typelibsdir = $(libdir)/girepository-1.0\n"))))
-          (add-after 'install 'wrap-udisksd
-            (lambda _
-              ;; Tell 'udisksd' where to find the 'mount' command.
-              (let ((utils #$(this-package-input "util-linux"))
-                    (cryptsetup #$(this-package-input "cryptsetup"))
-                    (parted #$(this-package-input "parted")))
-                (wrap-program (string-append #$output "/libexec/udisks2/udisksd")
-                  `("PATH" ":" prefix
-                    (,(string-append utils "/bin") ;for 'mount'
-                     ;; cryptsetup is required for setting encrypted
-                     ;; partitions, e.g. in gnome-disks
-                     ,(string-append cryptsetup "/sbin")
-                     "/run/current-system/profile/bin"
-                     "/run/current-system/profile/sbin")))))))))
+                 "typelibsdir = $(libdir)/girepository-1.0\n")))))))
     (home-page "https://www.freedesktop.org/wiki/Software/udisks/")
     (synopsis "Disk manager service")
     (description
-- 
2.46.0





      parent reply	other threads:[~2024-10-07 20:18 UTC|newest]

Thread overview: 16+ 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 ` [bug#71327] [PATCH 6/8] gnu: udisks: Remove input labels Maxim Cournoyer
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
2024-10-07 20:12 ` [bug#71327] [PATCH v2 0/7] gnu: udisks: Update to 3.1.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-07 20:12   ` [bug#71327] [PATCH v2 1/7] gnu: libbytesize: Update to 2.10 Nicolas Graves via Guix-patches via
2024-10-07 20:12   ` [bug#71327] [PATCH v2 2/7] gnu: libblockdev: Embed executable paths Nicolas Graves via Guix-patches via
2024-10-07 20:12   ` [bug#71327] [PATCH v2 3/7] gnu: libblockdev: Fix inputs Nicolas Graves via Guix-patches via
2024-10-07 20:12   ` [bug#71327] [PATCH v2 4/7] gnu: libblockdev: Update to 3.1.1 Nicolas Graves via Guix-patches via
2024-10-07 20:12   ` [bug#71327] [PATCH v2 5/7] gnu: libblockdev: Use gexps Nicolas Graves via Guix-patches via
2024-10-07 20:12   ` [bug#71327] [PATCH v2 6/7] gnu: udisks: Update to 2.10.1 Nicolas Graves via Guix-patches via
2024-10-07 20:12   ` Nicolas Graves via Guix-patches via [this message]

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=20241007201652.15133-8-ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=71327@debbugs.gnu.org \
    --cc=iskarian@mgsn.dev \
    --cc=maxim.cournoyer@gmail.com \
    --cc=ngraves@ngraves.fr \
    /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).