bpftools_full: restore

Can be removed too, if not needed Currently not needed by scx
chaotic-cx · Nov 1, 2024 · 5bd811e · 5bd811e
1 parent 31dbbc4
commit 5bd811e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -91,7 +91,7 @@ in
 
   beautyline-icons = final.callPackage ../pkgs/beautyline-icons { };
 
-  bpftools_full = final.callPackage ../pkgs/scx/bpftools-full.nix { };
+  bpftools_full = final.callPackage ../pkgs/bpftools-full { };
 
   busybox_appletless = multiOverride
     prev.busybox

diff --git a/pkgs/bpftools-full/default.nix b/pkgs/bpftools-full/default.nix
@@ -0,0 +1,24 @@
+{ bpftools
+, makeLinuxHeaders
+, llvmPackages
+, libcap
+, linux_latest
+, kernel ? linux_latest
+}:
+
+(bpftools.override {
+  linuxHeaders =
+    # Bumps to newer bpftools
+    makeLinuxHeaders {
+      inherit (kernel) src version patches;
+    };
+  # Enables "clang-bpf-co-re" feature
+  inherit (llvmPackages) stdenv;
+}).overrideAttrs (prevAttrs: {
+  buildInputs = prevAttrs.buildInputs ++ [
+    # Enables "llvm" feature
+    llvmPackages.llvm
+    # Enables "libcap" feature
+    libcap
+  ];
+})