diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-14 07:46:15 +0200 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-14 07:46:15 +0200 |
commit | d67507cacf934b970f67567bced4e044c3ca9753 (patch) | |
tree | b1c3160946ceaf74a9a24c7360d28036230210e1 /gnu/packages/containers.scm | |
parent | 3b3d9a13dd2bd67f34c890047680a1ce6e3af28e (diff) | |
parent | dd4c1992103a65b8fbdc80fe07a9fe9be822769a (diff) |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/containers.scm')
-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")) |