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

Merge pull request #51833 from Synthetica9/revert-47909-menuconfig

Browse Source 
Revert "linux: inside nix-shell, allow make menuconfig"
This commit is contained in:
Jörg Thalheim 2018-12-10 15:23:07 +00:00 committed by GitHub
commit 6e61418a64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -1,5 +1,4 @@
{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, pkgconfig ? null, ncurses ? null
, libelf , libelf
, utillinux , utillinux
, writeTextFile , writeTextFile
@ -266,7 +265,6 @@ 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 ]
++ optionals stdenv.lib.inNixShell [ pkgconfig ncurses ]
; ;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];