summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/lxc/default.nix1
-rw-r--r--pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch36
2 files changed, 0 insertions, 37 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 1f0cd69e594..bf3a05f1116 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -29,7 +29,6 @@ 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
deleted file mode 100644
index 3896813a58e..00000000000
--- a/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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>
-