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

osquery: fix build #52744

Merged
merged 1 commit into from Dec 24, 2018
Merged

osquery: fix build #52744

merged 1 commit into from Dec 24, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Dec 23, 2018 •
edited

Motivation for this change

As discussed in #51756, recently packaged versions of lvm2 miss the
lvm2app.h header which breaks the osquery build.

Please note that this simply fixes the build and is not an upgrade. The
CMake patches are fairly diverged in constrast to the current upstream
packaging which requires a lot more effort I can't provide ATM.

cc @markuskowa @hedning

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

hedning
hedning approved these changes Dec 23, 2018
View reviewed changes
Copy link
Contributor

@hedning hedning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Ma27
osquery: fix build
8934dae 
As discussed in NixOS#51756, recently packaged versions of `lvm2` miss the
`lvm2app.h` header which breaks the osquery build.

Please note that this simply fixes the build and is not an upgrade. The
CMake patches are fairly diverged in constrast to the current upstream
packaging which requires a lot more effort I can't provide ATM.

cc @markuskowa @hedning
@Ma27
Copy link
Member Author

Ma27 commented Dec 24, 2018 •
edited

thanks for the quick response! I'm now using a newer 2.02 version as suggested by @markuskowa. I'll wait for ofBorg to finish and merge then :)

@Ma27 Ma27 merged commit 8ae753e into NixOS:master Dec 24, 2018
@Ma27 Ma27 deleted the fix-osquery branch December 24, 2018 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markuskowa markuskowa markuskowa left review comments

@hedning hedning hedning approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ma27 @hedning @markuskowa @GrahamcOfBorg