mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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
This commit is contained in:
parent
574cb0e02b
commit
4a19e9178b
3 changed files with 14 additions and 1 deletions
|
@ -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 \
|
||||
|
|
|
@ -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)
|
||||
|
|
11
gnu/packages/patches/containerd-fix-includes.patch
Normal file
11
gnu/packages/patches/containerd-fix-includes.patch
Normal file
|
@ -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>
|
Loading…
Add table
Add a link
Reference in a new issue