summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2018-10-23 14:47:11 +0000
committerGitHub <noreply@github.com>2018-10-23 14:47:11 +0000
commitc67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6 (patch)
tree44801e7ae26204d64c1f1ebf41cb7d6c531bce78 /pkgs/os-specific/linux
parent00b555ef889b900c32c36ef9ef7fa3fb725ae4b5 (diff)
parente80324c6259fdc462b6efbb373d36c82797f1681 (diff)
downloadnixlib-c67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6.tar
nixlib-c67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6.tar.gz
nixlib-c67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6.tar.bz2
nixlib-c67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6.tar.lz
nixlib-c67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6.tar.xz
nixlib-c67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6.tar.zst
nixlib-c67ccd34c08fdb4e97c647c3fb09c1eb6e5431c6.zip
Merge pull request #47909 from teto/menuconfig
linux: inside nix-shell, allow make menuconfig
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 5e6023582082..1d280647c5a1 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,4 +1,5 @@
 { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
+, pkgconfig ? null, ncurses ? null
 , libelf
 , utillinux
 , writeTextFile
@@ -265,6 +266,7 @@ 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" ];