diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-01 12:56:13 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-01 13:00:58 -0400 |
| commit | 3aae9fc3f9cda64a808d294b34ecc683559644fe (patch) | |
| tree | b86d6091d3f3d97d8b0dd12bc7652cf869c28017 /nixos/modules/installer | |
| parent | 4477cf04b6779a537cdb5f0bd3dd30e75aeb4a3b (diff) | |
| download | nixlib-3aae9fc3f9cda64a808d294b34ecc683559644fe.tar nixlib-3aae9fc3f9cda64a808d294b34ecc683559644fe.tar.gz nixlib-3aae9fc3f9cda64a808d294b34ecc683559644fe.tar.bz2 nixlib-3aae9fc3f9cda64a808d294b34ecc683559644fe.tar.lz nixlib-3aae9fc3f9cda64a808d294b34ecc683559644fe.tar.xz nixlib-3aae9fc3f9cda64a808d294b34ecc683559644fe.tar.zst nixlib-3aae9fc3f9cda64a808d294b34ecc683559644fe.zip | |
nixos/iso-image.nix: fixes i686 installer iso build.
Fixes #45908
Diffstat (limited to 'nixos/modules/installer')
| -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/ |