summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2024-10-07 22:12:33 +0200
committerLudovic Courtès <ludo@gnu.org>2024-10-16 19:11:49 +0200
commit96317d13ae60f1d9a5b1b40b8f72ad8ddc4e653c (patch)
tree62bbd8649351d5a8e0742e6f3ddda7c168da5b43
parentf8573c326aca34126a7a6c13dfc85440801eee27 (diff)
downloadguix-96317d13ae60f1d9a5b1b40b8f72ad8ddc4e653c.tar.gz
gnu: udisks: Remove obsolete wrap-udisksd phase.
The tools are now patched in the libblockdev plugin sources directly.

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

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/freedesktop.scm16
1 files changed, 1 insertions, 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 @@ Analysis and Reporting Technology) functionality.")
                 (("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