about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/generic.nix
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2019-08-21 22:14:31 +0900
committerMatthieu Coudron <coudron@iij.ad.jp>2019-09-04 17:04:16 +0900
commit2207378c9e67dead15040e53d17888af7881ac28 (patch)
tree92c14cc272a692efefb043dc515486e8b30947c2 /pkgs/os-specific/linux/kernel/generic.nix
parent29c120c065d03b000224872251bed93932d42412 (diff)
linux: clearer origin for settings configuration
adds _file so that nix may have a chance to display what file the conflictings settings come
from.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/generic.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 2c01dcb973126..e6e1bd842363a 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -151,8 +151,8 @@ let
       moduleStructuredConfig = (lib.evalModules {
         modules = [
           module
-          { settings = commonStructuredConfig; }
-          { settings = structuredExtraConfig; }
+          { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; }
+          { settings = structuredExtraConfig; _file = "structuredExtraConfig"; }
         ]
         ++  structuredConfigFromPatches
         ;