mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
Merge pull request #51833 from Synthetica9/revert-47909-menuconfig
Revert "linux: inside nix-shell, allow make menuconfig"
This commit is contained in:
commit
6e61418a64
@ -1,5 +1,4 @@
|
||||
{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
|
||||
, pkgconfig ? null, ncurses ? null
|
||||
, libelf
|
||||
, utillinux
|
||||
, 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.15") utillinux
|
||||
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
|
||||
++ optionals stdenv.lib.inNixShell [ pkgconfig ncurses ]
|
||||
;
|
||||
|
||||
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
|
||||
|
Loading…
Reference in New Issue
Block a user