diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-10-07 22:12:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-10-16 19:11:48 +0200 |
| commit | a8bd933362f6bf26e4a11d062228aa52c2c0add1 (patch) | |
| tree | 9e5354558f934a4d974b082d22b5b96b3a8ad7ac /gnu | |
| parent | c3a8251f77f311de792a88019500653fd562abf5 (diff) | |
gnu: libblockdev: Use gexps.
* gnu/packages/disk.scm (libblockdev)
[phases]: Use gexps.
{patch-plugin-paths}: Use search-input-file.
Change-Id: I61f9b3dfdd4dc249fb0f59abb99826a8e759bb42
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/disk.scm | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 81bd4ec688..00674016a4 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1191,19 +1191,26 @@ to create devices with respective mappings for the ATARAID sets discovered.") "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-configuration-directory - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-configuration-directory + (lambda _ (substitute* "src/lib/blockdev.c" - (("/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))))))))) + (("/etc/libblockdev/conf.d/" path) + (string-append #$output path))))) + (add-after 'unpack 'patch-plugin-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src/plugins" "\\.c$") + (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) + (string-append + start (or (false-if-exception + (search-input-file inputs + (string-append "bin/" program))) + (false-if-exception + (search-input-file inputs + (string-append "sbin/" program))) + program))))))))) (native-inputs (list gobject-introspection pkg-config |