From ad2fd68cfff1c6c37744ac217cb8a718fc6fa417 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 20 Jan 2020 20:49:39 +0100 Subject: [PATCH] xen_4_8: fix build w/glibc-2.30 The header (and the `sysctl`-function) were unused, so the inclusion can be removed safely. This was done by upstream in 4.9 as well[1]. [1] https://github.com/xen-project/xen/commit/74858c9eaf335658b4c19cb4a848bb721065c233 --- pkgs/applications/virtualization/xen/4.8.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 1d0e01fcb82..a8d10769824 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -185,7 +185,10 @@ callPackage (import ./generic.nix (rec { # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. sed 1i'#include ' \ -i tools/blktap2/control/tap-ctl-allocate.c \ - -i tools/libxl/libxl_device.c + -i tools/libxl/libxl_device.c \ + -i tools/qemu-xen/hw/9pfs/9p.c + + sed -i -e '/sys\/sysctl\.h/d' tools/blktap2/drivers/block-remus.c ''; passthru.qemu-system-i386 = if withInternalQemu