diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-28 12:01:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 12:01:17 +0000 |
| commit | 5f4614a24e810583e5332348eb79f73637feac0e (patch) | |
| tree | 20629f663427ebec75071f5acf43a9e4bcbbfe53 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | cf2149f1d42850487d9cd08731f3f6df2449dc4c (diff) | |
| parent | bb87e609c03cdc4627d15c24f6bb8773ecf61413 (diff) | |
| download | nixpkgs-5f4614a24e810583e5332348eb79f73637feac0e.tar nixpkgs-5f4614a24e810583e5332348eb79f73637feac0e.tar.gz nixpkgs-5f4614a24e810583e5332348eb79f73637feac0e.tar.bz2 nixpkgs-5f4614a24e810583e5332348eb79f73637feac0e.tar.lz nixpkgs-5f4614a24e810583e5332348eb79f73637feac0e.tar.xz nixpkgs-5f4614a24e810583e5332348eb79f73637feac0e.tar.zst nixpkgs-5f4614a24e810583e5332348eb79f73637feac0e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 53e04b684d6..44e0b1d77b2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -317,10 +317,9 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] ++ optional (lib.versionAtLeast version "5.8") elfutils + ++ optional (lib.versionAtLeast version "5.2") zlib ; - buildInputs = optional (lib.versionAtLeast version "5.2") zlib; - hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. |