diff mbox series

[bug#63928] gnu: podman: Fix path to helper binaries.

Message ID 605ec1ab24117c2db1625bf1dafc7736e6080a51.1686062510.git.h.goebel@crazy-compilers.com
State New
Headers show
Series [bug#63928] gnu: podman: Fix path to helper binaries. | expand

Commit Message

Hartmut Goebel June 6, 2023, 2:41 p.m. UTC 
'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(+)


base-commit: 1a2eb26286c72ac2754969f53f5833b053b96b67

Comments

Ludovic Courtès July 1, 2023, 4:08 p.m. UTC | #1 
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> '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".

LGTM!
Hartmut Goebel July 2, 2023, 6:48 p.m. UTC | #2 
Am 01.07.23 um 18:08 schrieb Ludovic Courtès:
> LGTM!

Thanks for the review. Pushed as 1d471bbe440ba254c6e1c557d0fad91d67e1450c
diff mbox series

Patch

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index b402bbde6a..0cf89db23f 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -359,6 +359,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"))