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

f='/guix/commit/ROADMAP?id=3c8ca6b26bee110c4bcfbc6aaa7d4805b1915fc8'>commit</a><a href='/guix/diff/ROADMAP?id=3c8ca6b26bee110c4bcfbc6aaa7d4805b1915fc8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/ROADMAP'>
<input type='hidden' name='id' value='3c8ca6b26bee110c4bcfbc6aaa7d4805b1915fc8'/><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=3c8ca6b26bee110c4bcfbc6aaa7d4805b1915fc8'>root</a>/<a href='/guix/log/ROADMAP?id=3c8ca6b26bee110c4bcfbc6aaa7d4805b1915fc8'>ROADMAP</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/ROADMAP?id=3c8ca6b26bee110c4bcfbc6aaa7d4805b1915fc8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>