diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-15 18:27:25 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-16 01:13:30 +0200 |
| commit | 64fa0d5b974b13b222083ebc3103cf4a34687bd6 (patch) | |
| tree | 1cb106b8a3f2d1e0ce316d446b2591d8a9ec9033 /pkgs/os-specific/linux/kernel | |
| parent | 7a7e8a8004202675304d5d464a8a82658c3b4883 (diff) | |
| download | nixlib-64fa0d5b974b13b222083ebc3103cf4a34687bd6.tar nixlib-64fa0d5b974b13b222083ebc3103cf4a34687bd6.tar.gz nixlib-64fa0d5b974b13b222083ebc3103cf4a34687bd6.tar.bz2 nixlib-64fa0d5b974b13b222083ebc3103cf4a34687bd6.tar.lz nixlib-64fa0d5b974b13b222083ebc3103cf4a34687bd6.tar.xz nixlib-64fa0d5b974b13b222083ebc3103cf4a34687bd6.tar.zst nixlib-64fa0d5b974b13b222083ebc3103cf4a34687bd6.zip | |
kernel: Add deps for building 4.16
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 0bed93d76edb..216a7c7cb85d 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,4 +1,4 @@ -{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl +{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl , ncurses , libelf , utillinux @@ -82,7 +82,8 @@ let kernelConfig = kernelConfigFun config; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]; platformName = hostPlatform.platform.name; # e.g. "defconfig" diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3dae37136a2e..bd9334b8f9b7 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl +{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl , ncurses ? null , libelf , utillinux @@ -41,10 +41,10 @@ in { let inherit (stdenv.lib) - hasAttr getAttr optional optionalString optionalAttrs maintainers platforms; + hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = stdenv.lib.optional (stdenv.lib.versionAtLeast version "4.14") libelf; + moduleBuildDependencies = optional (stdenv.lib.versionAtLeast version "4.14") libelf; installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e @@ -262,6 +262,7 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; |