From ffd47d5b16d63191abc58761115561f7268264d3 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 10 Dec 2018 15:50:36 +0100 Subject: Revert "linux: inside nix-shell, allow make menuconfig" --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs') 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" ]; -- cgit 1.4.1