Merge pull request #110803 from Ericson2314/fix-nixos-misc-linux-config
nixos treewide: Fix references to linux-kernel.target
This commit is contained in:
commit
e34a53c4ea
|
@ -12,9 +12,6 @@ let
|
||||||
inherit (config.boot.loader.generationsDir) copyKernels;
|
inherit (config.boot.loader.generationsDir) copyKernels;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
|
|
||||||
inherit (pkgs.stdenv.hostPlatform) platform;
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -59,7 +56,7 @@ in
|
||||||
|
|
||||||
system.build.installBootLoader = generationsDirBuilder;
|
system.build.installBootLoader = generationsDirBuilder;
|
||||||
system.boot.loader.id = "generationsDir";
|
system.boot.loader.id = "generationsDir";
|
||||||
system.boot.loader.kernelFile = linux-kernel.target;
|
system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,8 +5,6 @@ with lib;
|
||||||
let
|
let
|
||||||
cfg = config.boot.loader.raspberryPi;
|
cfg = config.boot.loader.raspberryPi;
|
||||||
|
|
||||||
inherit (pkgs.stdenv.hostPlatform) platform;
|
|
||||||
|
|
||||||
builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
|
builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
|
||||||
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
|
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
|
||||||
|
|
||||||
|
@ -102,6 +100,6 @@ in
|
||||||
|
|
||||||
system.build.installBootLoader = builder;
|
system.build.installBootLoader = builder;
|
||||||
system.boot.loader.id = "raspberrypi";
|
system.boot.loader.id = "raspberrypi";
|
||||||
system.boot.loader.kernelFile = linux-kernel.target;
|
system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue