guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#71327] [PATCH 8/8] gnu: udisks: Remove obsolete wrap-udisksd phase.


From: Maxim Cournoyer
Subject: [bug#71327] [PATCH 8/8] gnu: udisks: Remove obsolete wrap-udisksd phase.
Date: Mon, 3 Jun 2024 08:02:56 -0400

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

* gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd
phase.

Change-Id: I0de4016adb0cb8af2dca4ef9ebec82e5951b689c
---
 gnu/packages/freedesktop.scm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 063816282b..39ca00296e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1789,22 +1789,7 @@ (define-public udisks
                (("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.
-             (let ((out   (assoc-ref outputs "out"))
-                   (utils (assoc-ref inputs "util-linux"))
-                   (cryptsetup (assoc-ref inputs "cryptsetup"))
-                   (parted (assoc-ref inputs "parted")))
-               (wrap-program (string-append out "/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.45.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]