From 9266a746c18e231668883ff2baabd25be64df6be Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Sep 2026 18:12:11 +0200 Subject: [PATCH] xbps: fix build w/ glibc-2.44 Failing Hydra build: https://hydra.nixos.org/build/344216369 --- pkgs/by-name/xb/xbps/package.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix index 6f3e1ef231ea..b343f27c4909 100644 --- a/pkgs/by-name/xb/xbps/package.nix +++ b/pkgs/by-name/xb/xbps/package.nix @@ -7,6 +7,7 @@ zlib, openssl, libarchive, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -33,6 +34,23 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./cert-paths.patch + # fix build w/ glibc-2.44 + (fetchpatch { + url = "https://github.com/void-linux/xbps/commit/7d02b79d3d7e0bf644adf8b412e76dba1b1fdce1.patch"; + hash = "sha256-iUNBmkkfR02/EFDkax/ZpE7oM+5IVDMmD0FYz7p0dQ4="; + }) + (fetchpatch { + url = "https://github.com/void-linux/xbps/commit/9a8002c5688c3cdda700b022bf432b4426d64042.patch"; + hash = "sha256-/94HKeyv9LaQv6QHE0CqmM1ajBOSNt9Sfh0XKV0RLMQ="; + }) + (fetchpatch { + url = "https://github.com/void-linux/xbps/commit/7f2f10300f235639c5880bea1e4b14245fd5fbda.patch"; + hash = "sha256-iZXiNYrSFaP55qyzefc3hqJ+SoIOsFILqnra6u5iGpM="; + }) + (fetchpatch { + url = "https://github.com/void-linux/xbps/commit/84f6a1be26348c265afedebe9cea958424b0aabf.patch"; + hash = "sha256-WDsGkI+3JnJskM+UKjI/UZP6ypMCd5+3rYtlQgQEr40="; + }) ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations";