From 69899ca818e5606fc4694cbaf3385562b7394dab Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Mon, 7 Oct 2024 22:12:28 +0200 Subject: gnu: libblockdev: Embed executable paths. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/disk.scm (libblockdev)[arguments]<#:phases>: Add 'patch-plugin-paths' phase. Fixes: . Signed-off-by: Maxim Cournoyer Change-Id: I96f9e2f03650b22ffef5a7fe091159450e4c5b67 Signed-off-by: Ludovic Courtès --- gnu/packages/disk.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 99b9e4d46d..b65df5186b 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Justin Veilleux +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2014, 2022 Ludovic Courtès ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Disseminate Dissent @@ -29,6 +30,7 @@ ;;; Copyright © 2023 Morgan Smith ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Sharlatan Hellseher + ;;; ;;; This file is part of GNU Guix. ;;; @@ -1195,7 +1197,13 @@ to create devices with respective mappings for the ATARAID sets discovered.") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "src/lib/blockdev.c" - (("/etc/libblockdev/conf.d/" path) (string-append out path))))))))) + (("/etc/libblockdev/conf.d/" path) (string-append out path)))))) + (add-after 'unpack 'patch-plugin-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src/plugins" "\\.c$") + (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) + ;; XXX: Use 'search-input-file' when available. + (string-append start (or (which program) program))))))))) (native-inputs (list gobject-introspection pkg-config -- cgit v1.2.3