tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
lxc: fix build for glibc-2.25
Franz Pletz
9 years ago
76ae7e19
f15cebd2
+37
2 changed files
expand all
collapse all
unified
split
pkgs
os-specific
linux
lxc
default.nix
fix-glibc-2.25.patch
+1
pkgs/os-specific/linux/lxc/default.nix
···
29
29
30
30
patches = [
31
31
./support-db2x.patch
32
32
+
./fix-glibc-2.25.patch
32
33
];
33
34
34
35
XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
+36
pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch
···
1
1
+
diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
2
2
+
index 75de17f..d6d98e4 100644
3
3
+
--- a/src/lxc/bdev/lxclvm.c
4
4
+
+++ b/src/lxc/bdev/lxclvm.c
5
5
+
@@ -30,6 +30,7 @@
6
6
+
#include <string.h>
7
7
+
#include <unistd.h>
8
8
+
#include <sys/wait.h>
9
9
+
+#include <sys/sysmacros.h>
10
10
+
11
11
+
#include "bdev.h"
12
12
+
#include "config.h"
13
13
+
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
14
14
+
index a93124b..948d716 100644
15
15
+
--- a/src/lxc/conf.c
16
16
+
+++ b/src/lxc/conf.c
17
17
+
@@ -48,6 +48,7 @@
18
18
+
#include <sys/stat.h>
19
19
+
#include <sys/socket.h>
20
20
+
#include <sys/syscall.h>
21
21
+
+#include <sys/sysmacros.h>
22
22
+
#include <sys/types.h>
23
23
+
#include <sys/utsname.h>
24
24
+
#include <sys/wait.h>
25
25
+
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
26
26
+
index 0dbbf2c..7135222 100644
27
27
+
--- a/src/lxc/lxccontainer.c
28
28
+
+++ b/src/lxc/lxccontainer.c
29
29
+
@@ -34,6 +34,7 @@
30
30
+
#include <sys/mman.h>
31
31
+
#include <sys/mount.h>
32
32
+
#include <sys/syscall.h>
33
33
+
+#include <sys/sysmacros.h>
34
34
+
#include <sys/types.h>
35
35
+
#include <sys/wait.h>
36
36
+