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

[staging-next] Revert "libassuan: Use automatically detected libgpg-error" #214170

Merged
merged 2 commits into from
Feb 2, 2023
Merged

[staging-next] Revert "libassuan: Use automatically detected libgpg-error" #214170

merged 2 commits into from
Feb 2, 2023

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Feb 2, 2023 •
edited
Loading

Description of changes

This reverts commit 2d44dc9.

Cross-compilation only works if we set --with-libgpg-error-prefix, which is why that flag was there in the first place. Unfortunately this was not noted in the commit message that added it, which made it difficult to discover. I've put it back and added a comment.

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

@alyssais
Revert "libassuan: Use automatically detected libgpg-error"
14d9512 
This reverts commit 2d44dc9.

Cross-compilation only works if we set --with-libgpg-error-prefix,
which is why that flag was there in the first place[1].  Unfortunately
this was not noted in the commit message that added it, which made it
difficult to discover…

[1]: NixOS#57815
@alyssais
libassuan: explain why we set libgpg-error prefix
a26fc6a
alyssais referenced this pull request Feb 2, 2023
@doronbehar
libassuan: Use automatically detected libgpg-error
2d44dc9
@alyssais alyssais added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Feb 2, 2023
@ofborg ofborg bot requested a review from erictapen February 2, 2023 12:49
@erictapen erictapen removed their request for review February 2, 2023 14:35
@doronbehar doronbehar merged commit 9476ff1 into NixOS:staging-next Feb 2, 2023
@alyssais alyssais deleted the libassuan-cross branch February 2, 2023 16:07
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

@Mindavi Mindavi Mindavi approved these changes

@doronbehar doronbehar doronbehar approved these changes

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@alyssais @SuperSandro2000 @Mindavi @doronbehar