tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
Merge #45910: Fix i686 installer iso build
Vladimír Čunát
7 years ago
0e7ba35d
62e3355a
+1
-1
1 changed file
expand all
collapse all
unified
split
nixos
modules
installer
cd-dvd
iso-image.nix
+1
-1
nixos/modules/installer/cd-dvd/iso-image.nix
···
233
233
"
234
234
# Make our own efi program, we can't rely on "grub-install" since it seems to
235
235
# probe for devices, even with --skip-fs-probe.
236
236
-
${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/bootx64.efi -p /EFI/boot -O x86_64-efi \
236
236
+
${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 \
237
237
$MODULES
238
238
cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
239
239