Skip to content

Comments

xxHash: add pkg-config file fix, clean up a bit#177851

Closed
K900 wants to merge 1 commit intoNixOS:staging-nextfrom
K900:staging-fix-xxhash
Closed

xxHash: add pkg-config file fix, clean up a bit#177851
K900 wants to merge 1 commit intoNixOS:staging-nextfrom
K900:staging-fix-xxhash

Conversation

@K900
Copy link
Contributor

@K900 K900 commented Jun 16, 2022

Description of changes

Add a patch to fix the pkg-config file generated by the new cmake-based build. Fixes tdesktop and friends. No nixpkgs-review because this is a lot, but tdesktop builds fine.

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.

@K900 K900 requested a review from ilya-fedin June 16, 2022 07:38
@K900
Copy link
Contributor Author

K900 commented Jun 16, 2022

Ping @RasmusRendal @vcunat

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 16, 2022
vcunat added a commit that referenced this pull request Jun 16, 2022
@vcunat
Merge #177851: xxHash: add pkg-config file fix, clean up a bit
ca9adc4 
...into staging-next
@vcunat
Copy link
Member

vcunat commented Jun 16, 2022

A very large rebuild :-( but yes, it looks like a regression since nixpkgs master.

@Mindavi
Copy link
Contributor

Mindavi commented Jun 18, 2022

This was merged, but github didn't properly register.

@Mindavi Mindavi closed this Jun 18, 2022
@K900
Copy link
Contributor Author

K900 commented Jun 18, 2022

Indeed.

@vcunat
Copy link
Member

vcunat commented Jun 19, 2022 •
edited
Loading

Commit 20972d6 was merged but this PR shows commit dc8c268. I'm not sure how this happened, but at least the diff seems the same.

@K900
Copy link
Contributor Author

K900 commented Jun 19, 2022

Probably because of your Committed-by

@K900 K900 reopened this Jun 19, 2022
@K900 K900 closed this Jun 19, 2022
@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. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 19, 2022
@Mindavi Mindavi mentioned this pull request Jun 20, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mindavi Mindavi Mindavi approved these changes

+2 more reviewers

@ilya-fedin ilya-fedin ilya-fedin approved these changes

@RasmusRendal RasmusRendal RasmusRendal approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@K900 @vcunat @Mindavi @ilya-fedin @RasmusRendal