Revert "linuxManualConfig: always depend on ubootTools"

This reverts commit e5e02f3214.
This commit is contained in:
Adam Joseph 2023-07-25 14:37:12 -07:00
parent eecef61ba5
commit 06f20db451

View File

@ -1,5 +1,5 @@
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, ubootTools
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
, fetchpatch
}:
@ -101,13 +101,13 @@ stdenv.mkDerivation ({
inherit version src;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
bc gmp libmpc mpfr nettools openssl perl python3Minimal rsync ubootTools
zstd
] ++ optional (lib.versionOlder version "5.8") libelf
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
++ optional (lib.versionAtLeast version "5.8") elfutils;
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ]
++ optional (target == "uImage") buildPackages.ubootTools
++ optional (lib.versionOlder version "5.8") libelf
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
++ optional (lib.versionAtLeast version "5.8") elfutils
;
patches =
map (p: p.patch) kernelPatches