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

[staging-next] gnugrep: Fix build on Musl #234943

Merged
merged 1 commit into from
May 30, 2023

Conversation

dasJ
Copy link
Member

@dasJ dasJ commented May 30, 2023

Description of changes
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.05 Release Notes (or backporting 22.11 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.

@dasJ dasJ requested review from risicle and vcunat May 30, 2023 06:18
@dasJ
Copy link
Member Author

dasJ commented May 30, 2023

This should work but is a draft because I currently don't have the build capacity to test this.
I might have more capacity near the end of this week.

It's still building for me.
PTAL

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

This way it rebuilds on all platforms. We could instead use if .isMusl then foo else null;

@dasJ
Copy link
Member Author

dasJ commented May 30, 2023

Fixed. I have successfully built pkgsStatic.gnugrep with this

@dasJ dasJ marked this pull request as ready for review May 30, 2023 06:54
@wegank
Copy link
Member

wegank commented May 30, 2023

@ofborg build pkgsStatic.gnugrep

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Rebuild fixed. I can now build pkgsStatic.gnugrep pkgsMusl.gnugrep

@vcunat
Copy link
Member

vcunat commented May 30, 2023

(ofBorg got the rebuild labels wrong; most likely confused by the force-push)

@dasJ dasJ deleted the fix/coreutils-musl branch May 30, 2023 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants