Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
This commit is contained in:
@@ -190,7 +190,7 @@ in
|
||||
|
||||
system.boot.loader.kernelFile = mkOption {
|
||||
internal = true;
|
||||
default = pkgs.stdenv.hostPlatform.platform.kernelTarget;
|
||||
default = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
||||
type = types.str;
|
||||
description = ''
|
||||
Name of the kernel file to be passed to the bootloader.
|
||||
|
||||
@@ -59,7 +59,7 @@ in
|
||||
|
||||
system.build.installBootLoader = generationsDirBuilder;
|
||||
system.boot.loader.id = "generationsDir";
|
||||
system.boot.loader.kernelFile = platform.kernelTarget;
|
||||
system.boot.loader.kernelFile = linux-kernel.target;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -103,6 +103,6 @@ in
|
||||
|
||||
system.build.installBootLoader = builder;
|
||||
system.boot.loader.id = "raspberrypi";
|
||||
system.boot.loader.kernelFile = platform.kernelTarget;
|
||||
system.boot.loader.kernelFile = linux-kernel.target;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user