Subject: [bug#74746] [PATCH 4/5] gnu: docker: Avoid build failing when looking for buildkit in PATH

From: [email-masked]
Date: Wed, 21 May 2025 14:36:34 +0000

Change-Id: I0607fc73ceb602e92bc8d5bbae3e079785dfd0ba
---
 gnu/packages/docker.scm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index f4ba760914..84b2dd5d92 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -484,10 +484,19 @@ (define-public docker
                    "exec.Command")
                   ;; Search for ZFS in PATH.
                   (("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")")
-                 ;; Do not fail when buildkit-qemu-<target> isn't found.
-                 ;; FIXME: We might need to package buildkit and docker's
-                 ;; buildx plugin, to support qemu-based docker containers.
-                  (("\\<LookPath\\(\"buildkit-qemu-\"") "LooxPath(\"buildkit-qemu-\"")
+                  ;; Do not fail when buildkit-qemu-<target> isn't found.
+                  ;; FIXME: We might need to package buildkit and docker's
+                  ;; buildx plugin, to support qemu-based docker containers.
+                  (("\\<LookPath\\(\"buildkit-qemu-\"")
+                   "LooxPath(\"buildkit-qemu-\"")
+                  (("\\<LookPath\\(\"buildkit-cni-bridge\"")
+                   "LooxPath(\"buildkit-cni-bridge\"")
+                  (("\\<LookPath\\(\"buildkit-cni-loopback\"")
+                   "LooxPath(\"buildkit-cni-loopback\"")
+                  (("\\<LookPath\\(\"buildkit-cni-host-local\"")
+                   "LooxPath(\"buildkit-cni-host-local\"")
+                  (("\\<LookPath\\(\"buildkit-cni-firewall\"")
+                   "LooxPath(\"buildkit-cni-firewall\"")
                   ;; Fail on other unsubstituted LookPaths.
                   (("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"")
                   (("\\<LooxPath") "LookPath")))))
-- 
2.49.0