iso-image: Build using strictDeps
This commit is contained in:
parent
f1100e1506
commit
556fc32d69
|
@ -233,7 +233,10 @@ let
|
||||||
# Notes about grub:
|
# Notes about grub:
|
||||||
# * Yes, the grubMenuCfg has to be repeated in all submenus. Otherwise you
|
# * Yes, the grubMenuCfg has to be repeated in all submenus. Otherwise you
|
||||||
# will get white-on-black console-like text on sub-menus. *sigh*
|
# will get white-on-black console-like text on sub-menus. *sigh*
|
||||||
efiDir = pkgs.runCommand "efi-directory" {} ''
|
efiDir = pkgs.runCommand "efi-directory" {
|
||||||
|
nativeBuildInputs = [ pkgs.buildPackages.grub2_efi ];
|
||||||
|
strictDeps = true;
|
||||||
|
} ''
|
||||||
mkdir -p $out/EFI/boot/
|
mkdir -p $out/EFI/boot/
|
||||||
|
|
||||||
# ALWAYS required modules.
|
# ALWAYS required modules.
|
||||||
|
@ -263,7 +266,7 @@ let
|
||||||
|
|
||||||
# Make our own efi program, we can't rely on "grub-install" since it seems to
|
# Make our own efi program, we can't rely on "grub-install" since it seems to
|
||||||
# probe for devices, even with --skip-fs-probe.
|
# probe for devices, even with --skip-fs-probe.
|
||||||
${pkgs.buildPackages.grub2_efi}/bin/grub-mkimage --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \
|
grub-mkimage --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \
|
||||||
$MODULES
|
$MODULES
|
||||||
cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
|
cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
|
||||||
|
|
||||||
|
@ -388,7 +391,10 @@ let
|
||||||
${refind}
|
${refind}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
efiImg = pkgs.runCommand "efi-image_eltorito" { nativeBuildInputs = [ pkgs.buildPackages.mtools pkgs.buildPackages.libfaketime pkgs.buildPackages.dosfstools ]; }
|
efiImg = pkgs.runCommand "efi-image_eltorito" {
|
||||||
|
nativeBuildInputs = [ pkgs.buildPackages.mtools pkgs.buildPackages.libfaketime pkgs.buildPackages.dosfstools ];
|
||||||
|
strictDeps = true;
|
||||||
|
}
|
||||||
# Be careful about determinism: du --apparent-size,
|
# Be careful about determinism: du --apparent-size,
|
||||||
# dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i)
|
# dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i)
|
||||||
''
|
''
|
||||||
|
|
Loading…
Reference in a new issue