From 1d471bbe440ba254c6e1c557d0fad91d67e1450c Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Tue, 6 Jun 2023 16:06:01 +0200
Subject: gnu: podman: Fix path to helper binaries.

'quadlet' and 'rootlessport' coming with podman reside in
"#$output/libexex/podman", not in "#$output/bin".  Thus search this
first.

* gnu/packages/containers.scm (podman)[phases]<fix-hardcoded-paths>:
  Change subsitution for "/usr/local/libexec/podman", add substitution
  for "/usr/local/lib/podman".
---
 gnu/packages/containers.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 463a834108..232d994fe3 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -360,6 +360,8 @@ configure network interfaces in Linux containers.")
                  (string-append "CATATONIT_PATH=" (which "true"))))
               (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
                 (("/usr/local/libexec/podman")
+                 (string-append #$output "/libexec/podman"))
+                (("/usr/local/lib/podman")
                  (string-append #$output "/bin")))
               (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
                 (("/usr/libexec/podman/conmon") (which "conmon"))
-- 
cgit v1.2.3

9ea7f71abf233512c30cf2a951dfe3f03f6b'>tree</a><a href='/guix/commit/gnu/packages/mes.scm?id=7e679ea7f71abf233512c30cf2a951dfe3f03f6b'>commit</a><a href='/guix/diff/gnu/packages/mes.scm?id=7e679ea7f71abf233512c30cf2a951dfe3f03f6b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/mes.scm'>
<input type='hidden' name='id' value='7e679ea7f71abf233512c30cf2a951dfe3f03f6b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=7e679ea7f71abf233512c30cf2a951dfe3f03f6b'>root</a>/<a href='/guix/log/gnu?id=7e679ea7f71abf233512c30cf2a951dfe3f03f6b'>gnu</a>/<a href='/guix/log/gnu/packages?id=7e679ea7f71abf233512c30cf2a951dfe3f03f6b'>packages</a>/<a href='/guix/log/gnu/packages/mes.scm?id=7e679ea7f71abf233512c30cf2a951dfe3f03f6b'>mes.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/mes.scm?id=7e679ea7f71abf233512c30cf2a951dfe3f03f6b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-05-06 14:39:45 +0200'>2022-05-06</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=984add419c8856f1ac76ed571fdef2491aaf7924'>gnu: mescc-tools: Update supported-systems.</a><span class='msg-avail'>...</span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2022-05-02 19:07:06 +0200'>2022-05-02</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=6b588da368c77cde82ea2f22ca315116228777ad'>gnu: mes: Update to 0.24.</a><span class='msg-avail'>...</span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2022-05-02 19:07:04 +0200'>2022-05-02</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=c14f1e319551fcc3112ad1facffd32a360118f96'>gnu: m2-planet: Update to 1.9.0.</a><span class='msg-avail'>...</span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2022-05-02 19:07:02 +0200'>2022-05-02</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=954ff74bc8e5f8855fac10903d552ec3f86d15f5'>gnu: mescc-tools: Update to 1.4.0.</a><span class='msg-avail'>...</span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2022-03-09 23:38:18 +0100'>2022-03-09</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=e2ca8119d5ddf240b492cd4af6acdaf4ed3f6632'>gnu: nyacc@1.00.2: Fix build.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-26 22:31:02 +0100'>2022-01-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=90a41fe388102d448b3f91a070e38a7680d2d568'>gnu: nyacc: Remove unnecessary phase.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-01-26 10:16:06 +0100'>2022-01-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=f15ca337bec89f238b9b9ced08c2e02c35629a33'>gnu: nyacc: Install all modules.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-01-26 08:37:57 +0100'>2022-01-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=3563558172e2f2711334bdf5ad5ce35c1452923a'>gnu: nyacc: Fix bug 60474.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-01-26 08:37:57 +0100'>2022-01-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=011db003ce43bf5dca41e5512ba07a42c77cb9ae'>gnu: nyacc: Update to 1.06.5.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2021-12-05 19:17:41 +0100'>2021-12-05</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=9bc0f45df5d6aed217020b1183dca54989844fb0'>Merge remote-tracking branch 'origin/master' into core-updates-frozen</a></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2021-11-25 10:15:57 +0530'>2021-11-25</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=29b594fa16254e4d228a2ca0ef6463a805d4c036'>gnu: nyacc: Update to 1.05.1.</a><span class='msg-avail'>...</span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2021-07-27 14:48:11 +0200'>2021-07-27</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=c0cd8b7614fd720475097c3a0dd95efc39114092'>gnu: mes: Remove input labels.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-26 13:31:27 +0200'>2021-07-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=e2690a8eb2df2cfc24bd84454dbfe092a6bf5139'>gnu: mes-rb5: Remove.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-26 13:24:28 +0200'>2021-07-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=5510e1c483128bd4be6f1446b7bcfb5252b219c2'>gnu: mes: Remove 0.19.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-26 13:24:28 +0200'>2021-07-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=81096caf7d122485f09226cdd8b2a117a39be4d9'>gnu: mes: Switch to Guile 3.0.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-26 13:24:28 +0200'>2021-07-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=114a9f1f803b53bd295c44b3719c1ed5dd288e40'>gnu: mescc-tools: Update to 1.2.0.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-26 13:24:27 +0200'>2021-07-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=0b9da8b5a2dd9bcb2800d60751eb462e3000fa73'>gnu: m2-planet: Update to 1.8.0.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-18 19:50:01 +0200'>2021-07-18</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=0e47fcced442d8e7c1b05184fdc1c14f10ed04ec'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-11 00:49:14 +0200'>2021-07-11</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=2f73ea3487b3bf6eb055c08aae7c53713d61a4d7'>gnu: Change inputs of core packages to plain lists.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-28 08:09:15 +0200'>2021-06-28</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=5532c8f42358ff21a3388c4bd6ae6946e0366723'>gnu: nyacc: Add final upstream description line, too.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-06-26 17:40:31 +0200'>2021-06-26</span></td><td><a href='/guix/commit/gnu/packages/mes.scm?id=c3dbf94143bc20bb23787a8f17dbf0e71287daa3'>gnu: nyacc: Update description for versions &gt;= 1.00.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>