diff options
| author | Philipp Steinpass <philipp@xndr.de> | 2017-11-28 00:15:48 +0100 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-28 15:19:23 +0200 |
| commit | e8fcced76e7f076340cd742c7179b5f4d32f079c (patch) | |
| tree | 41f0b24c47cf14e1c68bc38838d5d30cd6438ba9 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | acbaefa6156b67ecbb2cd3d5d65787d21790b815 (diff) | |
| download | nixpkgs-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar nixpkgs-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.gz nixpkgs-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.bz2 nixpkgs-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.lz nixpkgs-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.xz nixpkgs-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.zst nixpkgs-e8fcced76e7f076340cd742c7179b5f4d32f079c.zip | |
linux-testing: 4.14-rc8 -> 4.15-rc1
Closes #32137
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b0735e94619..b4ee23079d9 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,6 @@ { runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl +, libelf ? null +, utillinux ? null , writeTextFile, ubootTools , hostPlatform }: @@ -230,13 +232,18 @@ let }; in +assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null; +assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // { name = "linux-${version}"; enableParallelBuilding = true; nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] - ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools; + ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools + ++ optional (stdenv.lib.versionAtLeast version "4.15") libelf + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; |