From 298b5ccdab13ac7f63cf7c84fa1ce6eb01c28c02 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 13:26:39 -0400 Subject: linux/kernel/manual-config: Only import from derivation when explicitly asked to --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7cec47b86be..c943c8fa823 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 -- cgit 1.4.1