diff options
| author | K900 <me@0upti.me> | 2022-08-02 15:23:29 +0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-08-04 08:03:52 +0000 |
| commit | d35ec07b89720735a75754e01ed4532350f6b6fa (patch) | |
| tree | 116391b2ef4487f084b2e213acba84d63963fbbb | |
| parent | Merge #184611: thunderbird-91: 91.11.0 -> 91.12.0 (diff) | |
| download | nixpkgs-origin/backport-184812-to-release-22.05.tar.gz | |
linux: provide pahole when configuringorigin/backport-184812-to-release-22.05
The kernel checks the version of pahole at configuration time to know
if it supports features like split BTFs. If pahole doesn't exist,
all of that gets disabled in the config file, so the kernel ends up
built without split BTFs, despite having a working pahole for the actual
build.
(cherry picked from commit 6cd9a388df901e016cce9fcfecfad5cda5710e30)
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index bca6554ca2ae..056544014f42 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -6,6 +6,7 @@ , gmp ? null , libmpc ? null , mpfr ? null +, pahole , lib , stdenv @@ -124,7 +125,8 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl gmp libmpc mpfr ] - ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]; + ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ] + ++ lib.optional (lib.versionAtLeast version "5.2") pahole; platformName = stdenv.hostPlatform.linux-kernel.name; # e.g. "defconfig" |