diff options
| author | Shea Levy <shea@shealevy.com> | 2012-07-29 04:52:34 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-07-29 04:52:34 -0400 |
| commit | f7b6f01da1362931d5c58ec1fd78922966b3e2d4 (patch) | |
| tree | 7284a86b0ca3361053196d5e1bc2fcaec2c08faf /pkgs/os-specific | |
| parent | 98341e0bda814d6e92e9fef8522840eec738db4b (diff) | |
| download | nixlib-f7b6f01da1362931d5c58ec1fd78922966b3e2d4.tar nixlib-f7b6f01da1362931d5c58ec1fd78922966b3e2d4.tar.gz nixlib-f7b6f01da1362931d5c58ec1fd78922966b3e2d4.tar.bz2 nixlib-f7b6f01da1362931d5c58ec1fd78922966b3e2d4.tar.lz nixlib-f7b6f01da1362931d5c58ec1fd78922966b3e2d4.tar.xz nixlib-f7b6f01da1362931d5c58ec1fd78922966b3e2d4.tar.zst nixlib-f7b6f01da1362931d5c58ec1fd78922966b3e2d4.zip | |
linux/kernel/manual-config: Cleanup
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 777b33a84731..59fb1a6cd4c8 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -51,6 +51,7 @@ in # The kernel .config file config, # Manually specified features the kernel supports + # If unspecified, this will be autodetected from the .config features ? readFeatures config }: @@ -100,7 +101,7 @@ stdenv.mkDerivation ({ buildNativeInputs = [ perl nettools kmod ]; makeFlags = commonMakeFlags; -} // optionalAttrs features.modular { +} // optionalAttrs (features ? modular && features.modular) { makeFlags = commonMakeFlags ++ [ "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" ]; |