diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2023-06-06 16:06:01 +0200 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2023-07-02 20:27:22 +0200 |
commit | 1d471bbe440ba254c6e1c557d0fad91d67e1450c (patch) | |
tree | 8884010307222b3630fe5d0656d67ae9a32f80be /gnu/packages | |
parent | 39a3251feb2559e0b448f25671c26b9dd3318108 (diff) | |
download | guix-patches-1d471bbe440ba254c6e1c557d0fad91d67e1450c.tar guix-patches-1d471bbe440ba254c6e1c557d0fad91d67e1450c.tar.gz |
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".
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/containers.scm | 2 |
1 files changed, 2 insertions, 0 deletions
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")) |