diff options
| author | Andreas Enge <andreas@enge.fr> | 2025-07-11 22:28:31 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-17 22:21:14 +0200 |
| commit | bd7597ee3a354b51d085729e2278891ed617a7a4 (patch) | |
| tree | a95d8ad33d9d4ab009cf81f8b4b1dcb1177bcc82 | |
| parent | 01e1bc85a0ce9825c41fe365b063ee2312f9e680 (diff) | |
gnu: containerd: Fix build.
Fixes: guix/guix#1165
* gnu/packages/patches/containerd-fix-includes.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/docker.scm (containerd)[source]: Use patch.
Change-Id: Ib6dc3d2bd7ab5de7726dce07ca904c9f27a492e7
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/docker.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/containerd-fix-includes.patch | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 0545f4147d..9e9a0d6d9d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1152,6 +1152,7 @@ dist_patch_DATA = \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/compsize-fix-btrfs-progs-compatibility.patch \ %D%/packages/patches/containerd-create-pid-file.patch \ + %D%/packages/patches/containerd-fix-includes.patch \ %D%/packages/patches/converseen-hide-updates-checks.patch \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ %D%/packages/patches/cool-retro-term-wctype.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 4f6c5410ad..6dced98e82 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -203,7 +203,8 @@ Python without keeping their credentials in a Docker configuration file.") (sha256 (base32 "1m31y00sq2m76m1jiq4znws8gxbgkh5adklvqibxiz1b96vvwjk8")) (patches - (search-patches "containerd-create-pid-file.patch")))) + (search-patches "containerd-create-pid-file.patch" + "containerd-fix-includes.patch")))) (build-system go-build-system) (arguments (let ((make-flags #~(list (string-append "VERSION=" #$version) diff --git a/gnu/packages/patches/containerd-fix-includes.patch b/gnu/packages/patches/containerd-fix-includes.patch new file mode 100644 index 0000000000..0ae86cbd81 --- /dev/null +++ b/gnu/packages/patches/containerd-fix-includes.patch @@ -0,0 +1,11 @@ +diff -u -r a/vendor/github.com/containerd/btrfs/btrfs.c b/vendor/github.com/containerd/btrfs/btrfs.c +--- a/vendor/github.com/containerd/btrfs/btrfs.c 2025-07-11 22:08:17.013769624 +0200 ++++ b/vendor/github.com/containerd/btrfs/btrfs.c 2025-07-11 22:24:52.906525426 +0200 +@@ -15,6 +15,7 @@ + */ + + #include <stddef.h> ++#include <string.h> + #include <linux/magic.h> + #include <btrfs/ioctl.h> + #include <btrfs/ctree.h> |