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

osquery: fix build #333711

Merged
merged 1 commit into from
Aug 20, 2024
Merged

osquery: fix build #333711

merged 1 commit into from
Aug 20, 2024

Conversation

squalus
Copy link
Member

@squalus squalus commented Aug 10, 2024

Description of changes

Patch toolchain rpath manually instead of using autoPatchelfHook

Workaround for #333710

Fixes #332533

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Patch toolchain rpath manually instead of using autoPatchelfHook

Workaround for NixOS#333710

Fixes NixOS#332533
@ofborg ofborg bot requested review from znewman01 and nlewo August 10, 2024 16:25
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Aug 10, 2024
@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Aug 14, 2024
@h7x4 h7x4 merged commit 1ac7b31 into NixOS:master Aug 20, 2024
37 checks passed
@ElvishJerricco
Copy link
Contributor

Oh, sorry, I should have made it clear on the issue that #332617 was intended to fix this. We just needed to wait for a staging round to be merged into master :/

@ElvishJerricco
Copy link
Contributor

/cc @h7x4

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: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: osquery-5.12.2
5 participants