From a8684c98f433bdc64a335f1e06ec50ec1e79aff1 Mon Sep 17 00:00:00 2001 From: sergio Date: Mon, 22 Jun 2026 10:49:00 -0400 Subject: [PATCH] =?UTF-8?q?Etapa=20G:=20fixes=20para=20la=203ra=20pasada?= =?UTF-8?q?=20=E2=80=94=20hck/helix/xplr=20(frente=20C-bajo-zig)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Triage de la 2da pasada, todos del mismo frente (crate Rust con dep-C que zig-cc rompe): - helix: gueto gcc (tree-house-bindings/tree-sitter; cc-rs detecta familia con `zig -E` y falla) - xplr: gueto gcc (mlua-sys/Lua; link suelta _Unwind_* de libgcc bajo zig-cc) - hck: + deps.build=[zlib] (libdeflate ya pasó con gcc, ahora libz-sys pide -lz; gitui precedente) NOTA: hck y zellij declaran zlib (corpus), pero resolve_build_dep busca $base_dir/zlib.toml y en incoming/ no está ⇒ se construyen aparte desde recipes/ (donde zlib.toml es hermano). Co-Authored-By: Claude Opus 4.8 --- recipes/incoming/hck.toml | 4 ++++ recipes/incoming/helix.toml | 4 +++- recipes/incoming/xplr.toml | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/recipes/incoming/hck.toml b/recipes/incoming/hck.toml index 9dd28b78..5d9a9da5 100644 --- a/recipes/incoming/hck.toml +++ b/recipes/incoming/hck.toml @@ -20,5 +20,9 @@ flags = ["--bin", "hck"] [build.phases] install = "mkdir -p /out/usr/bin && cp target/release/hck /out/usr/bin/hck" +# libz-sys (vía gzp/libdeflate) enlaza -lz; el lab materializa zlib (libz.a) como overlay (igual que gitui). +[deps] +build = ["zlib"] + # buildInputs de nix (NO deps de hammer — cargo vendorea; backend Rust por # defecto). Si algún sys-crate C falla, adaptá per-paquete (patch/feature): cmake diff --git a/recipes/incoming/helix.toml b/recipes/incoming/helix.toml index 3fe224e2..6b02830a 100644 --- a/recipes/incoming/helix.toml +++ b/recipes/incoming/helix.toml @@ -11,8 +11,10 @@ tarball = "https://github.com/helix-editor/helix/archive/25.07.1/helix-25.07.1.t sha256 = "27c8bc3eba46bc7bab1e3629c6b28ff94882eeff17366b3ea69cd8ceffba7541" patches = ["fix-gotmpl-grammar-source.patch"] +# GUETO gcc: helix trae tree-house-bindings (tree-sitter en C); cc-rs hace detección de familia +# de compilador con `zig -E` y zig la rechaza. compiler="gcc" usa el musl gcc de Alpine. [build] -compiler = "zig-cc" +compiler = "gcc" target = "x86_64-linux-musl" link = "static" flags = [] diff --git a/recipes/incoming/xplr.toml b/recipes/incoming/xplr.toml index 13bb8932..029f0c83 100644 --- a/recipes/incoming/xplr.toml +++ b/recipes/incoming/xplr.toml @@ -9,8 +9,11 @@ version = "1.1.0" repo = "https://github.com/sayanarijit/xplr" commit = "db0e781f14ba4ab0242beb36ace87b679c744d4e" +# GUETO gcc: xplr embebe mlua-sys (compila Lua en C); bajo zig-cc el link falla con símbolos de +# unwinding sueltos (_Unwind_GetCFA/_Unwind_DeleteException, de libgcc). compiler="gcc" usa el musl +# gcc de Alpine que aporta su runtime de unwinding. [build] -compiler = "zig-cc" +compiler = "gcc" target = "x86_64-linux-musl" link = "static" flags = ["--bin", "xplr"]