diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 19:15:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 19:15:39 +0200 |
| commit | 0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3 (patch) | |
| tree | 35323e322cd3e2398161eebd52d1b6fd80d02d07 /nixos | |
| parent | 62e3355a91edb1c5ede65291529fd487fc754404 (diff) | |
| parent | 3aae9fc3f9cda64a808d294b34ecc683559644fe (diff) | |
| download | nixlib-0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3.tar nixlib-0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3.tar.gz nixlib-0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3.tar.bz2 nixlib-0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3.tar.lz nixlib-0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3.tar.xz nixlib-0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3.tar.zst nixlib-0e7ba35ddc51ee4d40a66efb45e991f9ce2dcab3.zip | |
Merge #45910: Fix i686 installer iso build
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 74fce0d1721d..98712f0759a9 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -233,7 +233,7 @@ let " # Make our own efi program, we can't rely on "grub-install" since it seems to # probe for devices, even with --skip-fs-probe. - ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/bootx64.efi -p /EFI/boot -O x86_64-efi \ + ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \ $MODULES cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ |