summary refs log tree commit diff
path: root/nixos/modules/installer/cd-dvd/iso-image.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-09-29 12:19:06 +0200
committerRobert Hensing <robert@roberthensing.nl>2022-09-29 12:19:06 +0200
commitf34135a73bd8ccc4a6e56981838feb5375c5011f (patch)
tree705a0d2e9223082916ecd02471ccc6164a9f7385 /nixos/modules/installer/cd-dvd/iso-image.nix
parentf54f12a6021419fccf66e06bfe35f2d684cfd8c7 (diff)
downloadnixpkgs-f34135a73bd8ccc4a6e56981838feb5375c5011f.tar
nixpkgs-f34135a73bd8ccc4a6e56981838feb5375c5011f.tar.gz
nixpkgs-f34135a73bd8ccc4a6e56981838feb5375c5011f.tar.bz2
nixpkgs-f34135a73bd8ccc4a6e56981838feb5375c5011f.tar.lz
nixpkgs-f34135a73bd8ccc4a6e56981838feb5375c5011f.tar.xz
nixpkgs-f34135a73bd8ccc4a6e56981838feb5375c5011f.tar.zst
nixpkgs-f34135a73bd8ccc4a6e56981838feb5375c5011f.zip
nixos/iso-image: Fix eval
Diffstat (limited to 'nixos/modules/installer/cd-dvd/iso-image.nix')
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 8b8786cd372..894b114bf89 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -41,6 +41,12 @@ let
     buildMenuAdditionalParamsGrub2 config ""
   ;
 
+  targetArch =
+    if config.boot.loader.grub.forcei686 then
+      "ia32"
+    else
+      pkgs.stdenv.hostPlatform.efiArch;
+
   /**
    * Given a `config` and params to add to `params`, build a set of default options.
    * Use this one when creating a variant (e.g. hidpi)
@@ -54,12 +60,6 @@ let
       initrd = "/boot/initrd";
     };
 
-  targetArch =
-    if config.boot.loader.grub.forcei686 then
-      "ia32"
-    else
-      stdenv.hostPlatform.efiArch;
-
   in
     menuBuilderGrub2
     finalCfg