01/02: gnu: podman: Fix path to helper binaries.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit 1d471bbe440ba254c6e1c557d0fad91d67e1450c
Author: Hartmut Goebel <h.goebel@crazy-compilers.com>
AuthorDate: Tue Jun 6 16:06:01 2023 +0200

    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(+)

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"))