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

libnatspec: fix build on darwin #175127

Merged
merged 2 commits into from
May 30, 2022
Merged

libnatspec: fix build on darwin #175127

merged 2 commits into from
May 30, 2022

Conversation

risicle
Copy link
Contributor

@risicle risicle commented May 28, 2022 •
edited
Loading

Description of changes

Broken in 3c12e95 when parentheses were removed, changing the semantics.

Use a simpler, more common construction to avoid such mixups.

ZHF: #172160

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

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 28, 2022
@risicle risicle marked this pull request as ready for review May 28, 2022 14:05
@risicle risicle force-pushed the ris-libnatspec-darwin-fix branch from dd4cef1 to d2b28d7 Compare May 28, 2022 22:12
@ofborg ofborg bot added 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 28, 2022
risicle added 2 commits May 30, 2022 22:22
@risicle
libnatspec: fix build on darwin
8e11324 
broken in 3c12e95 when parentheses
were removed, changing the semantics.

add libiconv universally to avoid such mixups.
@risicle
libnatspec: unmark broken on darwin
0120216
@risicle risicle force-pushed the ris-libnatspec-darwin-fix branch from d2b28d7 to 0120216 Compare May 30, 2022 21:23
@SuperSandro2000 SuperSandro2000 merged commit 67128e1 into NixOS:master May 30, 2022
@github-actions github-actions bot mentioned this pull request May 30, 2022
Merged
1 task
@github-actions
Copy link
Contributor

Successfully created backport PR #175529 for release-22.05.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

Assignees
No one assigned
Labels
0.kind: build failure A package fails to build 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@risicle @SuperSandro2000