diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-12-10 15:23:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 15:23:07 +0000 |
| commit | 6e61418a64233a3939a9017b5d893bae6797c8b0 (patch) | |
| tree | 5d396b818e22ce23a95e95c9ed2c4d17cb0ca0c5 /pkgs | |
| parent | 97ad321e4268caf803f81492c6914daf3029d533 (diff) | |
| parent | ffd47d5b16d63191abc58761115561f7268264d3 (diff) | |
| download | nixpkgs-6e61418a64233a3939a9017b5d893bae6797c8b0.tar nixpkgs-6e61418a64233a3939a9017b5d893bae6797c8b0.tar.gz nixpkgs-6e61418a64233a3939a9017b5d893bae6797c8b0.tar.bz2 nixpkgs-6e61418a64233a3939a9017b5d893bae6797c8b0.tar.lz nixpkgs-6e61418a64233a3939a9017b5d893bae6797c8b0.tar.xz nixpkgs-6e61418a64233a3939a9017b5d893bae6797c8b0.tar.zst nixpkgs-6e61418a64233a3939a9017b5d893bae6797c8b0.zip | |
Merge pull request #51833 from Synthetica9/revert-47909-menuconfig
Revert "linux: inside nix-shell, allow make menuconfig"
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 0ce6ed769a3..6adc3a33bb0 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -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" ]; |