GNU bug report logs - #71327
[PATCH 1/8] gnu: libbytesize: Update to 2.10.

Previous Next

Full log

View this message in rfc822 format

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian <at> mgsn.dev>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [bug#71327] [PATCH 2/8] gnu: libblockdev: Embed executable paths.
Date: Mon,  3 Jun 2024 08:02:50 -0400

From: Sarah Morgensen <iskarian <at> 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 <at> 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 <at> gnu.org>
 ;;; Copyright © 2021 Brice Waegeneire <brice <at> waegenei.re>
 ;;; Copyright © 2021 Justin Veilleux <terramorpha <at> cock.li>
+;;; Copyright © 2021 Sarah Morgensen <iskarian <at> mgsn.dev>
 ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent <at> protonmail.com>
@@ -29,6 +30,7 @@
 ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.