From 7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 24 Feb 2017 21:45:29 +0100
Subject: [PATCH] Revert "lxc: fix build for glibc-2.25"

This reverts commit 76ae7e19a9fa95b7111e244eeb3b8083a333477a.
---
 pkgs/os-specific/linux/lxc/default.nix        |  1 -
 .../linux/lxc/fix-glibc-2.25.patch            | 36 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 1f0cd69e5949..bf3a05f11161 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 3896813a58e9..000000000000
--- 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>
-