From 7f06aa700a6dd875dcfbd23165dc132747877596 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 7 Oct 2022 09:09:56 +0200 Subject: [PATCH] lxc: fix build w/glibc-2.36 Failing Hydra build: https://hydra.nixos.org/build/193338640 We don't need the `meson.build` fixes because (1) lxc4 doesn't use meson and (2) it contains some fixes to make sure it works both with newer and older glibc versions. Since we only ship glibc 2.36 from now on, we can skip that. --- pkgs/os-specific/linux/lxc/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 18c23c46c13c..49f16db002f3 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, perl, docbook2x -, docbook_xml_dtd_45, python3Packages, pam +, docbook_xml_dtd_45, python3Packages, pam, fetchpatch # Optional Dependencies , libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch + + # Backport of https://github.com/lxc/lxc/pull/4179 for glibc-2.36 build + (fetchpatch { + url = "https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3.patch"; + sha256 = "sha256-aC1XQesRJfkyQnloB3NvR4p/1WITrqkGYzw50PDxDrs="; + excludes = [ "meson.build" ]; + }) ]; postPatch = ''