[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#71327] [PATCH v2 2/7] gnu: libblockdev: Embed executable paths.
From: |
Nicolas Graves |
Subject: |
[bug#71327] [PATCH v2 2/7] gnu: libblockdev: Embed executable paths. |
Date: |
Mon, 7 Oct 2024 22:12:28 +0200 |
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 0f3bf10ffa..fa1b87127b 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.
;;;
@@ -1195,7 +1197,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.46.0
- [bug#71327] [PATCH v2 0/7] gnu: udisks: Update to 3.1.1. [security fixes], Nicolas Graves, 2024/10/07
- [bug#71327] [PATCH v2 1/7] gnu: libbytesize: Update to 2.10., Nicolas Graves, 2024/10/07
- [bug#71327] [PATCH v2 2/7] gnu: libblockdev: Embed executable paths.,
Nicolas Graves <=
- [bug#71327] [PATCH v2 6/7] gnu: udisks: Update to 2.10.1., Nicolas Graves, 2024/10/07
- [bug#71327] [PATCH v2 3/7] gnu: libblockdev: Fix inputs., Nicolas Graves, 2024/10/07
- [bug#71327] [PATCH v2 5/7] gnu: libblockdev: Use gexps., Nicolas Graves, 2024/10/07
- [bug#71327] [PATCH v2 7/7] gnu: udisks: Remove obsolete wrap-udisksd phase., Nicolas Graves, 2024/10/07
- [bug#71327] [PATCH v2 4/7] gnu: libblockdev: Update to 3.1.1., Nicolas Graves, 2024/10/07
- bug#71327: [PATCH v2 0/7] gnu: udisks: Update to 3.1.1. [security fixes], Ludovic Courtès, 2024/10/16