public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux/kernel/manual-config: Cleanup

Browse Source
This commit is contained in:
Shea Levy 2012-07-29 04:52:34 -04:00
parent 98341e0bda
commit f7b6f01da1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ in
# The kernel .config file # The kernel .config file
config, config,
# Manually specified features the kernel supports # Manually specified features the kernel supports
# If unspecified, this will be autodetected from the .config
features ? readFeatures config features ? readFeatures config
}: }:
@ -100,7 +101,7 @@ stdenv.mkDerivation ({
buildNativeInputs = [ perl nettools kmod ]; buildNativeInputs = [ perl nettools kmod ];
makeFlags = commonMakeFlags; makeFlags = commonMakeFlags;
} // optionalAttrs features.modular { } // optionalAttrs (features ? modular && features.modular) {
makeFlags = commonMakeFlags ++ [ makeFlags = commonMakeFlags ++ [
"MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" "MODLIB=\"$(out)/lib/modules/${modDirVersion}\""
]; ];