Skip to content

ananicy-cpp: make bpfSupport optional#330488

Merged
JohnRTitor merged 2 commits intoNixOS:masterfrom
JohnRTitor:ananicy-cpp
Jul 28, 2024
Merged

ananicy-cpp: make bpfSupport optional#330488
JohnRTitor merged 2 commits intoNixOS:masterfrom
JohnRTitor:ananicy-cpp

Conversation

@JohnRTitor
Copy link
Member

@JohnRTitor JohnRTitor commented Jul 27, 2024

Description of changes

ananicy-cpp compiled with bpfSupport does not work on hardened kernels
So we make it optional to allow users to disable it.

#327382

This is still enabled by default.

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.

use lib.cmakeBool and lib.cmakeFeature
switch to finalAttrs from recursion
format with nixfmt-rfc-style
@JohnRTitor JohnRTitor requested a review from Artturin July 27, 2024 19:36
@MrQubo
Copy link
Contributor

MrQubo commented Jul 27, 2024

I already started working on that.

@MrQubo
Copy link
Contributor

MrQubo commented Jul 27, 2024

I think we can use stdenv instead of clangStdenv with bpfSupport set to false.

@MrQubo
Copy link
Contributor

MrQubo commented Jul 27, 2024

Haven't checked yet, but we can probably make hardeningDisable optional on bpfSupport.

@JohnRTitor
Copy link
Member Author

JohnRTitor commented Jul 27, 2024

I think we can use stdenv instead of clangStdenv with bpfSupport set to false.

According to the docs, we could use GCC if bpf is disabled. But let's not complicate it further, my motto is "if its not broken don't fix it". Clang is better supported by ananicy-cpp anyway.

@MrQubo
Copy link
Contributor

MrQubo commented Jul 27, 2024

I think the option should be named withBpf instead of bpfSupport. It's not about ananicy-cpp supporting bpf or not, but whether bpf is enabled for ananicy-cpp.

ananicy-cpp compiled with bpf does not work on hardened kernels
So we make it optional to allow users to disable it

NixOS#327382
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 27, 2024
@JohnRTitor JohnRTitor merged commit f29ac0b into NixOS:master Jul 28, 2024
@JohnRTitor JohnRTitor deleted the ananicy-cpp branch August 2, 2024 09:01
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 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants