From 851fd9401f8f79454d1e3e0b786ba4afcaecd134 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Wed, 13 May 2026 02:00:12 +0300 Subject: [PATCH] elfutils: apply patch allowing R_386_TLS_DESC in shared libraries with elflint Submitted a patch upstream that already got merged to main, so grab it now. Tests fail without it on i686-linux. [1]: https://patchwork.sourceware.org/project/elfutils/patch/20260512211127.4157383-1-sergei@zimmerman.foo/ --- pkgs/by-name/el/elfutils/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix index 4a73d364c75c..fe3de1161954 100644 --- a/pkgs/by-name/el/elfutils/package.nix +++ b/pkgs/by-name/el/elfutils/package.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) + (fetchpatch { + name = "fix-i386_tlsdesc_relocation.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=bfd519cc58e190544a6785d3f0a27fcfaf7d8da3"; + hash = "sha256-N7DL2FG1AWLc+hcnxGMbUl5TuieoAc9OD6gc0sbsiGI="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];