BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lxc: fix build w/glibc-2.36

Browse source 
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.
This commit is contained in:
Maximilian Bosch 2022-10-07 09:09:56 +02:00
parent 1e33e85063
commit 7f06aa700a
No known key found for this signature in database
GPG key ID: 9A6EEA275CA5BE0A
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/os-specific/linux/lxc/default.nix
View file

@ -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 = ''