Commit 52a1b0c0 authored by Alyssa Ross's avatar Alyssa Ross Committed by Artturin
Browse files

linuxManualConfig: always depend on ubootTools 

Since 41f788b1 ("linuxManualConfig: use the default make target"),
we don't know ahead of time whether the kernel build will attempt to
produce a uImage in addition to whatever we're expecting it to build.
ubootTools is not a big dependency, so let's just always include it.
parent 3f84dd89

pkgs/os-specific/linux/kernel/manual-config.nix

+2 −3
Original line number Diff line number Diff line 
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl

, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod

, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod, ubootTools

, fetchpatch

}:
@@ -368,8 +368,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat 
  enableParallelBuilding = true;



  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ]

      ++ optional  (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools

  nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod 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 ]