summary refs log tree commit diff
path: root/pkgs/os-specific/linux/lxc
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@higgsboson.tk>2017-02-24 12:39:19 +0000
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-02-24 14:00:23 +0100
commit0eefe9bc629388f60eaad99d0841cf1aae8592a2 (patch)
treecc95f0542c6c569bc48b93b5972b8a1586b8a862 /pkgs/os-specific/linux/lxc
parent8f60b43d9c46ac59722262d545025f23bfb8bb68 (diff)
downloadnixpkgs-0eefe9bc629388f60eaad99d0841cf1aae8592a2.tar
nixpkgs-0eefe9bc629388f60eaad99d0841cf1aae8592a2.tar.gz
nixpkgs-0eefe9bc629388f60eaad99d0841cf1aae8592a2.tar.bz2
nixpkgs-0eefe9bc629388f60eaad99d0841cf1aae8592a2.tar.lz
nixpkgs-0eefe9bc629388f60eaad99d0841cf1aae8592a2.tar.xz
nixpkgs-0eefe9bc629388f60eaad99d0841cf1aae8592a2.tar.zst
nixpkgs-0eefe9bc629388f60eaad99d0841cf1aae8592a2.zip
lxc: fix glibc 2.25 incompatibility
Diffstat (limited to 'pkgs/os-specific/linux/lxc')
-rw-r--r--pkgs/os-specific/linux/lxc/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index ccee2a18a90..bf3a05f1116 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
+  # FIXME
+  # glibc 2.25 moved major()/minor() to <sys/sysmacros.h>.
+  # this commit should detect this: https://github.com/lxc/lxc/pull/1388/commits/af6824fce9c9536fbcabef8d5547f6c486f55fdf
+  # However autotools checks if mkdev is still defined in <sys/types.h> runs before
+  # checking if major()/minor() is defined there. The mkdev check succeeds with
+  # a warning and the check which should set MAJOR_IN_SYSMACROS is skipped.
+  NIX_CFLAGS_COMPILE = [ "-DMAJOR_IN_SYSMACROS" ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"