diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-10-07 09:09:56 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2023-03-29 09:50:27 +0200 |
| commit | 7f06aa700a6dd875dcfbd23165dc132747877596 (patch) | |
| tree | f262115a8418c9e970128aac8d46980b927db698 /pkgs/os-specific/linux/lxc/default.nix | |
| parent | 1e33e8506313d84a12c0cab7dd2291d47112adc6 (diff) | |
| download | nixpkgs-7f06aa700a6dd875dcfbd23165dc132747877596.tar nixpkgs-7f06aa700a6dd875dcfbd23165dc132747877596.tar.gz nixpkgs-7f06aa700a6dd875dcfbd23165dc132747877596.tar.bz2 nixpkgs-7f06aa700a6dd875dcfbd23165dc132747877596.tar.lz nixpkgs-7f06aa700a6dd875dcfbd23165dc132747877596.tar.xz nixpkgs-7f06aa700a6dd875dcfbd23165dc132747877596.tar.zst nixpkgs-7f06aa700a6dd875dcfbd23165dc132747877596.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/linux/lxc/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 18c23c46c13..49f16db002f 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 = '' |