From 5bd811e5fca917501fe90ccbcbee8eebbcfc8527 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:20:15 +0530 Subject: [PATCH] bpftools_full: restore Can be removed too, if not needed Currently not needed by scx --- overlays/default.nix | 2 +- pkgs/bpftools-full/default.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/bpftools-full/default.nix diff --git a/overlays/default.nix b/overlays/default.nix index 77ed89dad..29af58c3c 100644 --- 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 new file mode 100644 index 000000000..da1742d86 --- /dev/null +++ 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 + ]; +}) \ No newline at end of file