0001-WIP-re-orders-graphics-initialization.-to-be-squashe.patch

From 73fbda16c6255c3dd6564987b92605f32d43ccd7 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 24 Aug 2018 18:24:04 -0400
Subject: [PATCH] WIP: re-orders graphics initialization. (to be squashed)

This is to hopefully fix

 * https://github.com/NixOS/nixpkgs/pull/33686#issuecomment-415852913
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 12 +++++++++---
 1 file 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 74fce0d1721..40c0d1e4274 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -171,13 +171,19 @@ let
     # Menu configuration
     #
 
-    insmod gfxterm
-    insmod png
-    set gfxpayload=keep
+    insmod efi_gop
+    insmod efi_uga
+    insmod font
 
     # Fonts can be loaded?
     # (This font is assumed to always be provided as a fallback by NixOS)
     if loadfont (hd0)/EFI/boot/unicode.pf2; then
+      insmod png
+      insmod gfxterm
+
+      set gfxmode=auto
+      set gfxpayload=keep
+
       # Use graphical term, it can be either with background image or a theme.
       # input is "console", while output is "gfxterm".
       # This enables "serial" input and output only when possible.
-- 
2.16.4