Skip to content
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

Jump to bottom

Don't use hostPackages.{autoconf,automake} as build tools #372700

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Don't use hostPackages.{autoconf,automake} as build tools #372700

merged 3 commits into from
Jan 13, 2025
+8 −13

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Jan 10, 2025

Clean up automake/autoconf usage which cause build autotools for target during cross compiling, which cause
unnessesary build of automake-aarch64-linux during cross-compilation

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@avnik avnik marked this pull request as draft January 10, 2025 16:32
@avnik avnik requested a review from Mic92 January 10, 2025 16:32
@avnik
Copy link
Contributor Author

avnik commented Jan 10, 2025

Draft, until I test it with full system build

@nix-owners nix-owners bot requested a review from magnetophon January 10, 2025 16:40
avnik added 2 commits January 12, 2025 13:01
@avnik
xorg.{utilmacros,xkeyboardconfig}: treat autotools as native inputs
6eeba57 
Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
@avnik
aalib: cleanup, config.{sub,guess} updated by stdenv hook now
1c29d68 
Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
@avnik avnik force-pushed the avnik/automake-cleanup branch from e55b3b0 to 60c46fd Compare January 12, 2025 11:11
@avnik avnik changed the base branch from master to staging January 12, 2025 11:12
@avnik
Copy link
Contributor Author

avnik commented Jan 12, 2025

It survives system rebuild, and big stuff like browsers and offices works

@avnik avnik marked this pull request as ready for review January 12, 2025 11:13
@avnik
Copy link
Contributor Author

avnik commented Jan 12, 2025

Also rebased to staging due mass-rebuild

@avnik @Mic92
ladspaPlugins: fix cross-compilation for aarch64
81806a9 
Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
@Mic92 Mic92 force-pushed the avnik/automake-cleanup branch from 60c46fd to 81806a9 Compare January 13, 2025 10:14
@Mic92 Mic92 merged commit 9566918 into NixOS:staging Jan 13, 2025
16 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92

@magnetophon magnetophon Awaiting requested review from magnetophon

Assignees
No one assigned
Labels
10.rebuild-darwin: 1001-2500 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@avnik @Mic92