diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2018-10-05 18:00:15 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2018-10-05 18:00:15 +0900 |
| commit | e80324c6259fdc462b6efbb373d36c82797f1681 (patch) | |
| tree | 7a5c615b37c7aa5b3a610ec7ef076b26955bf9d4 /pkgs/os-specific/linux | |
| parent | 8bc64b6c24b1b7bf46ddf4d3ee6a7d9a5f055d0c (diff) | |
| download | nixlib-e80324c6259fdc462b6efbb373d36c82797f1681.tar nixlib-e80324c6259fdc462b6efbb373d36c82797f1681.tar.gz nixlib-e80324c6259fdc462b6efbb373d36c82797f1681.tar.bz2 nixlib-e80324c6259fdc462b6efbb373d36c82797f1681.tar.lz nixlib-e80324c6259fdc462b6efbb373d36c82797f1681.tar.xz nixlib-e80324c6259fdc462b6efbb373d36c82797f1681.tar.zst nixlib-e80324c6259fdc462b6efbb373d36c82797f1681.zip | |
linux: inside nix-shell, allow make menuconfig
Use stdenv.lib.inNixShell to check for nix-shell and potentially bring pkgconfig/ncurses.
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 2 |
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" ]; |