From 2f3e0581ef13d2fea32b640dd4352389abb09f50 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 19 Jun 2024 10:20:15 -0700 Subject: [PATCH] linuxKernel: drop conditionals for versions greater Linux 4.16; that's all of them --- pkgs/os-specific/linux/kernel/generic.nix | 3 +-- pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 081cfcaa8b60..5981de673242 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -140,8 +140,7 @@ let passAsFile = [ "kernelConfig" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl gmp libmpc mpfr ] - ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ] + nativeBuildInputs = [ perl gmp libmpc mpfr bison flex ] ++ lib.optional (lib.versionAtLeast version "5.2") pahole ++ lib.optionals withRust [ rust-bindgen rustc ] ; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b54b13a53d92..323b77e85140 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -143,6 +143,8 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + bison + flex perl bc nettools @@ -156,7 +158,6 @@ let python3Minimal kmod ] ++ optional needsUbootTools ubootTools - ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optionals withRust [ rustc rust-bindgen ];