@@ -8,13 +8,17 @@ let
88
99 efi = config.boot.loader.efi;
1010
11− realGrub = if cfg.version == 1 then pkgs.grub
12− else if cfg.zfsSupport then pkgs.grub2.override { zfsSupport = true; }
11+ grubPkgs =
12+ # Package set of targeted architecture
13+ if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs;
14+
15+ realGrub = if cfg.version == 1 then grubPkgs.grub
16+ else if cfg.zfsSupport then grubPkgs.grub2.override { zfsSupport = true; }
1317 else if cfg.trustedBoot.enable
1418 then if cfg.trustedBoot.isHPLaptop
15− then pkgs.trustedGrub-for-HP
16− else pkgs.trustedGrub
17− else pkgs.grub2;
19+ then grubPkgs.trustedGrub-for-HP
20+ else grubPkgs.trustedGrub
21+ else grubPkgs.grub2;
1822
1923 grub =
2024 # Don't include GRUB if we're only generating a GRUB menu (e.g.,
@@ -58,14 +62,10 @@ let
5862 version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber
5963 extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels
6064 default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios;
61− path = (makeBinPath ([
62− pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
63− pkgs.utillinux ]
64− ++ (optional (cfg.efiSupport && (cfg.version == 2)) pkgs.efibootmgr)
65− ++ (optionals cfg.useOSProber [pkgs.busybox pkgs.os-prober])
66− )) + ":" + (makeSearchPathOutput "bin" "sbin" [
67− pkgs.mdadm pkgs.utillinux
68− ]);
65+ path = with pkgs; makeBinPath (
66+ [ coreutils gnused gnugrep findutils diffutils btrfs-progs utillinux mdadm ]
67+ ++ optional (cfg.efiSupport && (cfg.version == 2)) efibootmgr
68+ ++ optionals cfg.useOSProber [ busybox os-prober ]);
6969 font = if cfg.font == null then ""
7070 else (if lib.last (lib.splitString "." cfg.font) == "pf2"
7171 then cfg.font
@@ -512,6 +512,15 @@ in
512512 '';
513513 };
514514
515+ forcei686 = mkOption {
516+ default = false;
517+ type = types.bool;
518+ description = ''
519+ Whether to force the use of a ia32 boot loader on x64 systems. Required
520+ to install and run NixOS on 64bit x86 systems with 32bit (U)EFI.
521+ '';
522+ };
523+
515524 trustedBoot = {
516525
517526 enable = mkOption {