diff options
author | Shea Levy <shea@shealevy.com> | 2012-07-29 13:26:39 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-07-29 13:26:39 -0400 |
commit | 298b5ccdab13ac7f63cf7c84fa1ce6eb01c28c02 (patch) | |
tree | 02fd2c299d2b101329c7d6deb9982fd5e0736552 /pkgs/os-specific/linux/kernel/manual-config.nix | |
parent | f0694a3151133543750f2418f9f83a297ee83147 (diff) |
linux/kernel/manual-config: Only import from derivation when explicitly asked to
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7cec47b86be96..c943c8fa823c2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -92,7 +92,9 @@ in config, # Manually specified features the kernel supports # If unspecified, this will be autodetected from the .config - features ? readFeatures config + features ? optionalAttrs allowImportFromDerivation (readFeatures config), + # Whether to utilize the controversial import-from-derivation feature to parse the config + allowImportFromDerivation ? false }: let |