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

glibcLocales, glibcLocalesUtf8: only define non-null on linux-glibc #181384

Merged
merged 1 commit into from
Jul 13, 2022

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jul 13, 2022

Before the change glibcLocales was pulled in on musl (built successfully
but was not needed: musl does not know how to load glibc locales) and
on android (failed build there). Android failed eval due to the
headers -> zip -> libc recursion.

The change limits glibcLocales down to linux && gnu to target linux-glibc.

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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Before the change glibcLocales was pulled in on musl (built successfully
but was not needed: musl does not know how to load glibc locales) and
on android (failed build there). Android failed eval due to the
headers -> zip -> libc recursion.

The change limits glibcLocales down to linux && gnu to target linux-glibc.
@trofi trofi requested a review from Artturin July 13, 2022 19:12
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 13, 2022
@Artturin Artturin merged commit 62b1c34 into NixOS:master Jul 13, 2022
@trofi trofi deleted the glibcLocales-only-glibc branch July 13, 2022 21:58
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: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants