diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-10-23 11:28:32 -0500 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-12-03 10:22:06 -0600 |
| commit | 13f89aee64e9a2ba69b32672253728f51b7c7f81 (patch) | |
| tree | 3fd102961e865f2f07d2fbb6467282e4c8b45151 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | 8ae7fa854163929ff417e183c3300d452fd267a3 (diff) | |
| download | nixpkgs-13f89aee64e9a2ba69b32672253728f51b7c7f81.tar nixpkgs-13f89aee64e9a2ba69b32672253728f51b7c7f81.tar.gz nixpkgs-13f89aee64e9a2ba69b32672253728f51b7c7f81.tar.bz2 nixpkgs-13f89aee64e9a2ba69b32672253728f51b7c7f81.tar.lz nixpkgs-13f89aee64e9a2ba69b32672253728f51b7c7f81.tar.xz nixpkgs-13f89aee64e9a2ba69b32672253728f51b7c7f81.tar.zst nixpkgs-13f89aee64e9a2ba69b32672253728f51b7c7f81.zip | |
linux: further cleanup config after drop of 4.9
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d046c8c7d19..edfd1f7dbc2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -55,8 +55,7 @@ let hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = [ perl ] - ++ optional (lib.versionAtLeast version "4.14") libelf + moduleBuildDependencies = [ perl libelf ] ++ optional (lib.versionAtLeast version "5.13") zstd; drvAttrs = config_: kernelConf: kernelPatches: configfile: @@ -100,7 +99,7 @@ let patches = map (p: p.patch) kernelPatches # Required for deterministic builds along with some postPatch magic. - ++ optional (lib.versionAtLeast version "4.13" && lib.versionOlder version "5.19") ./randstruct-provide-seed.patch + ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch # Fixes determinism by normalizing metadata for the archive of kheaders ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; @@ -353,7 +352,7 @@ let }; in -assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null; +assert lib.versionOlder version "5.8" -> libelf != null; assert lib.versionAtLeast version "5.8" -> elfutils != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // { @@ -365,7 +364,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools - ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf + ++ optional (lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] |