From f3edeca23701740c252f45fccd5bb00dfcc59619 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 13 Sep 2024 16:18:27 +0000 Subject: [PATCH] moby: linux-armbian kernel: use `enableCommonConfig` instead of copying the nixpkgs config into kernelPatches --- pkgs/additional/linux-armbian/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/additional/linux-armbian/default.nix b/pkgs/additional/linux-armbian/default.nix index d59c94ef3..e10ec269c 100644 --- a/pkgs/additional/linux-armbian/default.nix +++ b/pkgs/additional/linux-armbian/default.nix @@ -28,7 +28,7 @@ linux_latest.override { autoModules = withFullConfig; preferBuiltin = withFullConfig; - enableCommonConfig = false; #< common nix config enabled manually below + enableCommonConfig = withNixpkgsConfig; kernelPatches = patches.megous.series ++ # with patches.megous; [ @@ -388,12 +388,12 @@ linux_latest.override { MODEM_POWER = yes; }; } - ] ++ lib.optionals withNixpkgsConfig [ - { - name = "nixpkgs-config"; - patch = null; - extraStructuredConfig = linux_latest.commonStructuredConfig; - } + # ] ++ lib.optionals withNixpkgsConfig [ + # { + # name = "nixpkgs-config"; + # patch = null; + # extraStructuredConfig = linux_latest.commonStructuredConfig; + # } ] ++ lib.optionals usePmosConfig [ { name = "postmarketos-config";