nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 21:03:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: inside nix-shell, allow make menuconfig

Browse Source 
Use stdenv.lib.inNixShell to check for nix-shell and potentially bring pkgconfig/ncurses.
This commit is contained in:
Matthieu Coudron 2018-10-05 18:00:15 +09:00
parent 8bc64b6c24
commit e80324c625
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -1,4 +1,5 @@
{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, pkgconfig ? null, ncurses ? null
, libelf , libelf
, utillinux , utillinux
, writeTextFile , 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.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ optionals stdenv.lib.inNixShell [ pkgconfig ncurses ]
; ;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];