natalie
/
nixpkgs-custom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

grub-config.xml: handle a null font 

(cherry picked from commit 52de38f5f40a97dc46bbb9a442903f26e087bd30)
release-18.03-flake
Graham Christensen 2018-06-05 10:37:12 -04:00
parent fb16f66418
commit 4da554df0f
No known key found for this signature in database
GPG Key ID: ACA1C1D120C83D5C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -64,9 +64,10 @@ let
)) + ":" + (makeSearchPathOutput "bin" "sbin" [
pkgs.mdadm pkgs.utillinux
]);
font = if lib.last (lib.splitString "." cfg.font) == "pf2"
font = if cfg.font == null then ""
else (if lib.last (lib.splitString "." cfg.font) == "pf2"
then cfg.font
else "${convertedFont}";
else "${convertedFont}");
});
bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {}