diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-07-25 14:37:12 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-07-28 12:32:02 -0700 |
| commit | 06f20db451844c5f048e99e3e3f6870ae998c9e5 (patch) | |
| tree | 8067ea9a290e9d527689d216db15c03d0edf63d7 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | eecef61ba5c8f3f6ec21752b7f5c15c91a04a7b5 (diff) | |
| download | nixpkgs-06f20db451844c5f048e99e3e3f6870ae998c9e5.tar nixpkgs-06f20db451844c5f048e99e3e3f6870ae998c9e5.tar.gz nixpkgs-06f20db451844c5f048e99e3e3f6870ae998c9e5.tar.bz2 nixpkgs-06f20db451844c5f048e99e3e3f6870ae998c9e5.tar.lz nixpkgs-06f20db451844c5f048e99e3e3f6870ae998c9e5.tar.xz nixpkgs-06f20db451844c5f048e99e3e3f6870ae998c9e5.tar.zst nixpkgs-06f20db451844c5f048e99e3e3f6870ae998c9e5.zip | |
Revert "linuxManualConfig: always depend on ubootTools"
This reverts commit e5e02f3214ae381142606cf5defc35888d73f883.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d7ea4ac2c49..9908d22c411 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -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 |