Skip to content

Bake guest paths (/igloo) into staged binaries #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lacraig2 merged 1 commit into from
Jun 9, 2026
Merged

Bake guest paths (/igloo) into staged binaries #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/mk-arch-bundle.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ pkgs.runCommand "penguin-tools-${penguinArch}"
interp="$(patchelf --print-interpreter "$source_ref" 2>/dev/null || true)"
if [ -n "$interp" ]; then
copy_dependency "$interp"
new_interp="/igloo_static/dylibs/$arch/$(basename "$interp")"
# These binaries run on the *guest*, where penguin mounts this arch's
# dylibs flat at /igloo/dylibs (see config_patchers.py). Use that path,
# not the container's /igloo_static/dylibs/<arch>.
new_interp="/igloo/dylibs/$(basename "$interp")"
padded_interp="$(pad_interpreter "$new_interp" "$interp")"
else
padded_interp=""
Expand All @@ -105,7 +108,7 @@ pkgs.runCommand "penguin-tools-${penguinArch}"
copy_dependency "$resolved"
done < <(patchelf --print-needed "$source_ref" 2>/dev/null || true)

patchelf --set-rpath "/igloo_static/dylibs/$arch" "$dest" 2>/dev/null || true
patchelf --set-rpath "/igloo/dylibs" "$dest" 2>/dev/null || true

if [ -n "$interp" ]; then
# MIPS targets are flaky when patchelf rewrites the interpreter path.
Expand Down Expand Up @@ -256,7 +259,9 @@ pkgs.runCommand "penguin-tools-${penguinArch}"
;;
copy:tree)
stage_tree "$tool_path" "$arch_dir/$tool_name"
rewrite_text_refs "$tool_path" "/igloo_static/$arch/$tool_name" "$arch_dir/$tool_name"
# On the guest this tree is mounted at /igloo/utils/<tool> (the arch
# dir maps to /igloo/utils), so rewrite its internal references there.
rewrite_text_refs "$tool_path" "/igloo/utils/$tool_name" "$arch_dir/$tool_name"
;;
symlink:binary|symlink:tree)
ln -sfn "$tool_link_target" "$arch_dir/$tool_name"
Expand Down
Loading