lib/systems/default.nix: add efiArch suffixes

[unbel13ver]

Move already implemented functionality to the upper level so it could be used in a more generic way.

Signed-off-by: Ivan Nikolaenko ivan.nikolaenko@unikie.com

Description of changes

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 22.11 Release Notes (or backporting 22.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
  • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
• Fits CONTRIBUTING.md.

[alyssais]

This can go to master, btw, since it's not a mass-rebuild.

(Here's how to do that without accidentally pinging code owners.)

[unbel13ver]

This can go to master, btw, since it's not a mass-rebuild.

(Here's how to do that without accidentally pinging code owners.)

And yet again, I've done that in a wrong way, sorry!

[alyssais]

And yet again, I've done that in a wrong way, sorry!

No worries — it's a horrible GitHub quirk. I heard the other day that we might have discovered an easier way of doing it, so hopefully that can end up in the documentation soon.

[roberth]

This broke eval, blocking the channels https://hydra.nixos.org/jobset/nixos/unstable-small#tabs-errors

{UNKNOWN}: aggregate job ‘tested’ failed with the error: nixos.tests.boot.biosCdrom.x86_64-linux: error: undefined variable 'targetArch'

       at /nix/store/k38k0x7adns7glmv4z6iw7gshrg1xxc4-source/nixos/modules/installer/cd-dvd/iso-image.nix:275:117:

          274|     # probe for devices, even with --skip-fs-probe.
          275|     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} \
             |                                                                                                                     ^
          276|       $MODULES
nixos.iso_minimal.x86_64-linux: error: undefined variable 'targetArch'

       at /nix/store/k38k0x7adns7glmv4z6iw7gshrg1xxc4-source/nixos/modules/installer/cd-dvd/iso-image.nix:275:117:

          274|     # probe for devices, even with --skip-fs-probe.
          275|     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} \
             |                                                                                                                     ^
          276|       $MODULES
 at /nix/store/yi625cadgqpikk21cys15minw5ppz9zq-hydra-perl-deps/lib/perl5/site_perl/5.34.1/Catalyst/Model/DBIC/Schema.pm line 526

[roberth]

And eval's back https://hydra.nixos.org/eval/1782600