Unverified Commit 3039676d authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #262677 from Artturin/repick2 

linuxManualConfig: always depend on ubootTools
parents 0fa884ae 52a1b0c0

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

}:
@@ -364,8 +364,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 ]