diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-24 17:43:58 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-24 17:57:41 +0100 |
| commit | 76ae7e19a9fa95b7111e244eeb3b8083a333477a (patch) | |
| tree | 26865dcc7b933b42c7f21c06a34b46114a29aeb6 /pkgs/os-specific/linux/lxc | |
| parent | f15cebd28cd010549f4331cbd9968d3ac22cc146 (diff) | |
| download | nixpkgs-76ae7e19a9fa95b7111e244eeb3b8083a333477a.tar nixpkgs-76ae7e19a9fa95b7111e244eeb3b8083a333477a.tar.gz nixpkgs-76ae7e19a9fa95b7111e244eeb3b8083a333477a.tar.bz2 nixpkgs-76ae7e19a9fa95b7111e244eeb3b8083a333477a.tar.lz nixpkgs-76ae7e19a9fa95b7111e244eeb3b8083a333477a.tar.xz nixpkgs-76ae7e19a9fa95b7111e244eeb3b8083a333477a.tar.zst nixpkgs-76ae7e19a9fa95b7111e244eeb3b8083a333477a.zip | |
lxc: fix build for glibc-2.25
Diffstat (limited to 'pkgs/os-specific/linux/lxc')
| -rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index bf3a05f1116..1f0cd69e594 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch + ./fix-glibc-2.25.patch ]; XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; diff --git a/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch b/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch new file mode 100644 index 00000000000..3896813a58e --- /dev/null +++ b/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch @@ -0,0 +1,36 @@ +diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c +index 75de17f..d6d98e4 100644 +--- a/src/lxc/bdev/lxclvm.c ++++ b/src/lxc/bdev/lxclvm.c +@@ -30,6 +30,7 @@ + #include <string.h> + #include <unistd.h> + #include <sys/wait.h> ++#include <sys/sysmacros.h> + + #include "bdev.h" + #include "config.h" +diff --git a/src/lxc/conf.c b/src/lxc/conf.c +index a93124b..948d716 100644 +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -48,6 +48,7 @@ + #include <sys/stat.h> + #include <sys/socket.h> + #include <sys/syscall.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/utsname.h> + #include <sys/wait.h> +diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c +index 0dbbf2c..7135222 100644 +--- a/src/lxc/lxccontainer.c ++++ b/src/lxc/lxccontainer.c +@@ -34,6 +34,7 @@ + #include <sys/mman.h> + #include <sys/mount.h> + #include <sys/syscall.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/wait.h> + |