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.

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

glibcInfo: use makeFlags instead of buildPhase #238028

Merged
merged 2 commits into from Jun 16, 2023
Merged

glibcInfo: use makeFlags instead of buildPhase #238028

merged 2 commits into from Jun 16, 2023

Conversation

ghost
Copy link

@ghost ghost commented Jun 16, 2023

Description of changes

This commit causes glibc/info.nix to use the standard builder's buildPhase so things like preBuild, postBuild, enableParallelBuilding, etc work correctly.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

Adam Joseph added 2 commits June 15, 2023 20:14
This commit allows to include `makeFlags` in a glibc derivation
without clobbering the flags from `common.nix`
This commit causes glibc/info.nix to use the standard builder's
`buildPhase` so things like `preBuild`, `postBuild`,
`enableParallelBuilding`, etc work correctly.
@ofborg ofborg bot requested review from Ma27 and edolstra June 16, 2023 04:39
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jun 16, 2023
@wegank wegank merged commit 4d374bf into NixOS:staging Jun 16, 2023
@ghost ghost deleted the pr/glibc/info/useMakeFlags branch June 18, 2023 02:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant