diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-05-03 15:52:22 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-05-04 19:37:49 -0400 |
| commit | 556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc (patch) | |
| tree | 1c3af69a9bdcfb7d2be4f82606b4fc3a42871fa9 /nixos/modules/installer/cd-dvd/iso-image.nix | |
| parent | f1100e15066c7f1eeff66e0e9dcdaf29131f876b (diff) | |
| download | nixpkgs-556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc.tar nixpkgs-556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc.tar.gz nixpkgs-556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc.tar.bz2 nixpkgs-556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc.tar.lz nixpkgs-556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc.tar.xz nixpkgs-556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc.tar.zst nixpkgs-556fc32d699e2ee3b1e7fbf3bb35eb80b966e7fc.zip | |
iso-image: Build using strictDeps
Diffstat (limited to 'nixos/modules/installer/cd-dvd/iso-image.nix')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index d421e3ea428..324b38070e4 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -233,7 +233,10 @@ let # Notes about grub: # * Yes, the grubMenuCfg has to be repeated in all submenus. Otherwise you # 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/ # ALWAYS required modules. @@ -263,7 +266,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.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 cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ @@ -388,7 +391,10 @@ let ${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, # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' |