diff options
| author | Sarah Morgensen <iskarian@mgsn.dev> | 2024-10-07 22:12:28 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-10-16 19:11:47 +0200 |
| commit | 69899ca818e5606fc4694cbaf3385562b7394dab (patch) | |
| tree | 8c30e834b58b1e70b8e0d3eef31e119326b05bd9 /gnu | |
| parent | 355795f2d81bbff27f1dbd1d2ab1e6f13daf7ee7 (diff) | |
gnu: libblockdev: Embed executable paths.
* 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
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/disk.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 99b9e4d46d6..b65df5186b5 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org> | 22 | ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org> |
| 23 | ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> | 23 | ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> |
| 24 | ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li> | 24 | ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li> |
| 25 | ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> | ||
| 25 | ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org> | 26 | ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org> |
| 26 | ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> | 27 | ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> |
| 27 | ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@protonmail.com> | 28 | ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@protonmail.com> |
| @@ -29,6 +30,7 @@ | |||
| 29 | ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith@outlook.com> | 30 | ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith@outlook.com> |
| 30 | ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> | 31 | ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> |
| 31 | ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> | 32 | ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> |
| 33 | |||
| 32 | ;;; | 34 | ;;; |
| 33 | ;;; This file is part of GNU Guix. | 35 | ;;; This file is part of GNU Guix. |
| 34 | ;;; | 36 | ;;; |
| @@ -1195,7 +1197,13 @@ to create devices with respective mappings for the ATARAID sets discovered.") | |||
| 1195 | (lambda* (#:key outputs #:allow-other-keys) | 1197 | (lambda* (#:key outputs #:allow-other-keys) |
| 1196 | (let ((out (assoc-ref outputs "out"))) | 1198 | (let ((out (assoc-ref outputs "out"))) |
| 1197 | (substitute* "src/lib/blockdev.c" | 1199 | (substitute* "src/lib/blockdev.c" |
| 1198 | (("/etc/libblockdev/conf.d/" path) (string-append out path))))))))) | 1200 | (("/etc/libblockdev/conf.d/" path) (string-append out path)))))) |
| 1201 | (add-after 'unpack 'patch-plugin-paths | ||
| 1202 | (lambda* (#:key inputs #:allow-other-keys) | ||
| 1203 | (substitute* (find-files "src/plugins" "\\.c$") | ||
| 1204 | (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) | ||
| 1205 | ;; XXX: Use 'search-input-file' when available. | ||
| 1206 | (string-append start (or (which program) program))))))))) | ||
| 1199 | (native-inputs | 1207 | (native-inputs |
| 1200 | (list gobject-introspection | 1208 | (list gobject-introspection |
| 1201 | pkg-config | 1209 | pkg-config |
