pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #262677 from Artturin/repick2

linuxManualConfig: always depend on ubootTools

authored by Artturi and committed by GitHub 3039676d 0fa884ae

+2 -3
unified split
+2 -3
pkgs/os-specific/linux/kernel/manual-config.nix
··· 1 { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl 2 - , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod 3 , fetchpatch 4 }: 5 ··· 364 enableParallelBuilding = true; 365 366 depsBuildBuild = [ buildPackages.stdenv.cc ]; 367 - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ] 368 - ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools 369 ++ optional (lib.versionOlder version "5.8") libelf 370 ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] 371 ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
··· 1 { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl 2 + , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod, ubootTools 3 , fetchpatch 4 }: 5 ··· 364 enableParallelBuilding = true; 365 366 depsBuildBuild = [ buildPackages.stdenv.cc ]; 367 + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ubootTools ] 368 ++ optional (lib.versionOlder version "5.8") libelf 369 ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] 370 ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]