From 7d3875618f9a72d16f920a2aa5b0ff30f99e24aa Mon Sep 17 00:00:00 2001 From: whispers Date: Mon, 20 Jul 2026 10:50:54 -0400 Subject: [PATCH] minimal-boostrap.mes: use vendored ldexpl.c this was initially introduced in #494801 but accidentally reverted in #519568. --- pkgs/os-specific/linux/minimal-bootstrap/mes/libc.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/libc.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/libc.nix index edf1a2f15640..b2165a74a30e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/mes/libc.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/libc.nix @@ -8,7 +8,6 @@ in ln-boot, mes, buildPlatform, - fetchurl, }: let pname = "mes-libc"; @@ -24,18 +23,16 @@ let sources = sourcesJson."${arch}.linux.gcc"; inherit (sources) libtcc1_SOURCES libc_gnu1_SOURCES libc_gnu2_SOURCES; - ldexpl = fetchurl { - url = "https://gitlab.com/janneke/mes/-/raw/c837abed8edb341d4e56913729fbe9803b4de47c/lib/math/ldexpl.c"; - hash = "sha256-3QoFZZIqVmlMUosEqOdYIMEHzYgQ7GJ7Hz0Bf/1iIig="; - }; - # Concatenate all source files into a convenient bundle # "gcc" variants of source files (eg. "lib/linux/x86-mes-gcc") can also be # compiled by tinycc # # Passing this many arguments is too much for kaem so we need to split # the operation in two - firstLibc = libc_gnu1_SOURCES + " ${ldexpl}"; + # + # We also vendor a copy of ldexpl. We do not `fetchurl` it as the mes GitLab + # often has force pushes and links are thus unstable. + firstLibc = libc_gnu1_SOURCES + " " + ./ldexpl.c; lastLibc = libc_gnu2_SOURCES; in kaem.runCommand "${pname}-${version}"