diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-24 21:45:29 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-24 21:45:29 +0100 |
| commit | 7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5 (patch) | |
| tree | fd0049532be024073294b6b247a9fe5cea4d9acc /pkgs/os-specific/linux/lxc | |
| parent | 1c555e772e3ce080184225d1074e9eb0cc99f94d (diff) | |
| download | nixpkgs-7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5.tar nixpkgs-7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5.tar.gz nixpkgs-7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5.tar.bz2 nixpkgs-7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5.tar.lz nixpkgs-7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5.tar.xz nixpkgs-7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5.tar.zst nixpkgs-7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5.zip | |
Revert "lxc: fix build for glibc-2.25"
This reverts commit 76ae7e19a9fa95b7111e244eeb3b8083a333477a.
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, 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> - |