From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 71327@debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@mgsn.dev>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#71327] [PATCH 2/8] gnu: libblockdev: Embed executable paths.
Date: Mon, 3 Jun 2024 08:02:50 -0400 [thread overview]
Message-ID: <0c4bd8c7db24d0734320d4fdb2a2ce1f86a801d2.1717382583.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com>
From: Sarah Morgensen <iskarian@mgsn.dev>
* gnu/packages/disk.scm (libblockdev)[arguments]<#:phases>: Add
'patch-plugin-paths' phase.
Fixes: <https://bugs.gnu.org/33896>.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I96f9e2f03650b22ffef5a7fe091159450e4c5b67
---
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 10d546b918..10073864ed 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -22,6 +22,7 @@
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@protonmail.com>
@@ -29,6 +30,7 @@
;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
+
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1196,7 +1198,13 @@ (define-public libblockdev
(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
--
2.45.1
next prev parent reply other threads:[~2024-06-03 12:11 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 ` Maxim Cournoyer [this message]
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
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=0c4bd8c7db24d0734320d4fdb2a2ce1f86a801d2.1717382583.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=71327@debbugs.gnu.org \
--cc=iskarian@mgsn.dev \
/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).