From 6a9b14f96579cb484e68c5d8c28d18946134fec8 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Fri, 30 Sep 2022 17:45:05 +0100 Subject: [PATCH] re-enable kernel checkedConfig support Sometimes config options get silenty removed because they have dependencies on other options that haven't been enabled. If you add those as attributes here, the kernel build will check they're _still_ present in the config after make oldconfig has run. --- default.nix | 2 +- kernel/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 7ff623e..f84d1fb 100644 --- a/default.nix +++ b/default.nix @@ -14,7 +14,7 @@ let ] nixpkgs.pkgs; squashfs = liminix.builders.squashfs config.filesystem.contents; kernel = callPackage ./kernel { - inherit (config.kernel) config; + inherit (config.kernel) config checkedConfig; }; in { outputs = { diff --git a/kernel/default.nix b/kernel/default.nix index f9d8386..1769762 100644 --- a/kernel/default.nix +++ b/kernel/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , config +, checkedConfig }: let source = fetchFromGitHub { @@ -36,7 +37,6 @@ let in { vmlinux = callPackage ./vmlinux.nix { - inherit tree; - inherit config; + inherit tree config checkedConfig; }; }