colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

moby: linux-armbian kernel: use enableCommonConfig instead of copying the nixpkgs config into kernelPatches

Browse Source
This commit is contained in:
Colin
2024-09-13 16:18:27 +00:00
parent 8b3e413cae
commit f3edeca237
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/additional/linux-armbian/default.nix
View File

@@ -28,7 +28,7 @@ linux_latest.override {
autoModules = withFullConfig; autoModules = withFullConfig;
preferBuiltin = withFullConfig; preferBuiltin = withFullConfig;
enableCommonConfig = false; #< common nix config enabled manually below enableCommonConfig = withNixpkgsConfig;
kernelPatches = patches.megous.series ++ kernelPatches = patches.megous.series ++
# with patches.megous; [ # with patches.megous; [
@@ -388,12 +388,12 @@ linux_latest.override {
MODEM_POWER = yes; MODEM_POWER = yes;
}; };
} }
] ++ lib.optionals withNixpkgsConfig [ # ] ++ lib.optionals withNixpkgsConfig [
{ # {
name = "nixpkgs-config"; # name = "nixpkgs-config";
patch = null; # patch = null;
extraStructuredConfig = linux_latest.commonStructuredConfig; # extraStructuredConfig = linux_latest.commonStructuredConfig;
} # }
] ++ lib.optionals usePmosConfig [ ] ++ lib.optionals usePmosConfig [
{ {
name = "postmarketos-config"; name = "postmarketos-config";