Skip to content

overlay hunt: Remove systemd overlay: upstream patch merged#1843

Merged
brianmcgillion merged 2 commits intotiiuae:mainfrom
vadika:drop-systemd-overlay
Mar 22, 2026
Merged

overlay hunt: Remove systemd overlay: upstream patch merged#1843
brianmcgillion merged 2 commits intotiiuae:mainfrom
vadika:drop-systemd-overlay

Conversation

@vadika
Copy link
Copy Markdown
Contributor

@vadika vadika commented Mar 21, 2026

Summary

  • Remove the pam_systemd_home PAM_TEXT_INFO overlay for systemd, as the upstream patch (systemd/systemd#40412) has been merged and is available in the current locked nixpkgs revision (b40629efe5d6)
  • This overlay was causing a massive rebuild cascade: patching systemd changes the derivation hash of virtually every package in the closure (via dbus, polkit, udev, glib, gtk, qt, etc.), forcing from-source rebuilds of inkscape, openjdk, qtbase6, and hundreds of others that would otherwise be fetched from the binary cache
  • Eliminates the single largest source of unnecessary build time for native x86_64 targets

Test plan

  • Verify nix build .#lenovo-x1-carbon-gen11-debug --dry-run shows significantly fewer packages to build from source

Copy link
Copy Markdown
Contributor

@avnik avnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Copy Markdown
Collaborator

@vunnyso vunnyso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the pre-merge failures are unrelated to this PR, then LGTM.

The pam_systemd_home PAM_TEXT_INFO patch (systemd/systemd#40412) has been
merged upstream and is now available in the locked nixpkgs revision.

This overlay was causing a massive rebuild cascade: since systemd is a
transitive dependency of virtually every package (via dbus, polkit, udev,
glib, gtk, qt, etc.), patching it forced from-source rebuilds of packages
like inkscape, openjdk, qtbase6, and hundreds of others that would
otherwise be fetched from the binary cache.

Signed-off-by: vadik likholetov <vadikas@gmail.com>
@vadika vadika force-pushed the drop-systemd-overlay branch from 8ea0539 to 6a445b3 Compare March 22, 2026 09:36
@vadika vadika changed the title Remove systemd overlay: upstream patch merged overlay hunt: Remove systemd overlay: upstream patch merged Mar 22, 2026
The existing cross-compilation overlay fixed EFI_ARCH detection and
AR/RANLIB but missed three issues causing build failures:

sbsigntool:
- CCAN configurator compiled for target arch could not execute on build
  host. Fix: override CC to native compiler for create-ccan-tree.
- ./configure lacked --host/--build flags for cross-compilation.
- help2man cannot run cross-compiled binaries. Fix: exclude docs.

efitools:
- Default `all` target runs freshly-built tools (cert-to-efi-sig-list,
  sign-efi-sig-list) for cert generation, which fails when cross-compiled.
  Fix: build only CLI binaries, skip cert/auth generation.

Signed-off-by: vadik likholetov <vadikas@gmail.com>
@brianmcgillion brianmcgillion merged commit e7438f9 into tiiuae:main Mar 22, 2026
31 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants