public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61814 from thoughtpolice/nixpkgs/fix-linux-5.2

Browse Source 
linux_testing (5.2.0-rc1): fix build, include 'cpio' in nativeBuildInputs
This commit is contained in:
Austin Seipp
2019-05-21 12:12:29 -05:00
committed by GitHub
parent 46056ce4ab c117aa3ec3
commit 3354bd90a1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/manual-config.nix
+2 -1
View File
@@ -1,5 +1,5 @@
{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf , libelf, cpio
, utillinux , utillinux
, writeTextFile , writeTextFile
}: }:
@@ -288,6 +288,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
; ;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];