diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix index 304fb1a6a426..a56dd6a19ff2 100644 --- a/modules/installer/generations-dir/generations-dir.nix +++ b/modules/installer/generations-dir/generations-dir.nix @@ -42,8 +42,7 @@ let }; # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk - platform = (if pkgs ? platform then pkgs.platform else - { name = "pc"; uboot = null; }); + platform = pkgs.stdenv.platform; in { require = [ @@ -58,9 +57,6 @@ in menuBuilder = generationsDirBuilder; }; boot.loader.id = "generationsDir"; - boot.loader.kernelFile = ( - if (platform.name == "sheevaplug") then "uImage" - else if (platform.name == "versatileARM") then "zImage" - else "bzImage"); + boot.loader.kernelFile = platform.kernelTarget; }; } diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix index f393d04955a7..4217e0d481c4 100644 --- a/modules/installer/grub/grub.nix +++ b/modules/installer/grub/grub.nix @@ -149,7 +149,7 @@ in # Common attribute for boot loaders so only one of them can be # set at once. system.boot.loader.id = "grub"; - system.boot.loader.kernelFile = "bzImage"; + system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget; environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];