diff options
Diffstat (limited to 'pkgs/tools/misc/grub')
-rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/pvgrub_image/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/trusted.nix | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 63511782f00b6..481a07ef491b5 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -28,8 +28,8 @@ let "aarch64-linux".target = "arm64"; }; - canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); - inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); + canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); + inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); version = "2.02"; @@ -86,14 +86,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-grub-mount" ] # dep of os-prober ++ optional zfsSupport "--enable-libzfs" - ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ] - ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.system}.target}"]; + ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] + ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; # save target that grub is compiled for grubTarget = if efiSupport - then "${efiSystemsInstall.${stdenv.system}.target}-efi" + then "${efiSystemsInstall.${stdenv.hostPlatform.system}.target}-efi" else if inPCSystems - then "${pcSystems.${stdenv.system}.target}-pc" + then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" else ""; doCheck = false; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index df5e3f15e95ad..19d8afb185752 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { tar -cf memdisk.tar grub.cfg # We include all modules except all_video.mod as otherwise grub will fail printing "no symbol table" # if we include it. - grub-mkimage -O "${efiSystemsBuild.${stdenv.system}.target}-xen" -c grub-bootstrap.cfg \ - -m memdisk.tar -o "grub-${efiSystemsBuild.${stdenv.system}.target}-xen.bin" \ - $(ls "${grub2_xen}/lib/grub/${efiSystemsBuild.${stdenv.system}.target}-xen/" |grep 'mod''$'|grep -v '^all_video\.mod''$') + grub-mkimage -O "${efiSystemsBuild.${stdenv.hostPlatform.system}.target}-xen" -c grub-bootstrap.cfg \ + -m memdisk.tar -o "grub-${efiSystemsBuild.${stdenv.hostPlatform.system}.target}-xen.bin" \ + $(ls "${grub2_xen}/lib/grub/${efiSystemsBuild.${stdenv.hostPlatform.system}.target}-xen/" |grep 'mod''$'|grep -v '^all_video\.mod''$') mkdir -p "$out/lib/grub-xen" - cp "grub-${efiSystemsBuild.${stdenv.system}.target}-xen.bin" $out/lib/grub-xen/ + cp "grub-${efiSystemsBuild.${stdenv.hostPlatform.system}.target}-xen.bin" $out/lib/grub-xen/ ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 63a73658e0ac2..0e867d7cffd03 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -10,7 +10,7 @@ let "x86_64-linux".target = "i386"; }; - inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); + inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); version = if for_HP_laptop then "1.2.1" else "1.2.0"; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { # save target that grub is compiled for grubTarget = if inPCSystems - then "${pcSystems.${stdenv.system}.target}-pc" + then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" else ""; doCheck = false; |