From f15ca7a1270be370ba4bac5d5a39c776c987c632 Mon Sep 17 00:00:00 2001
From: Daniel Thwaites <danthwaites30@btinternet.com>
Date: Thu, 16 May 2024 09:46:46 +0100
Subject: [PATCH] grub: include font name as argument

---
 modules/grub/nixos.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/grub/nixos.nix b/modules/grub/nixos.nix
index 878242b6f..80b4a383d 100644
--- a/modules/grub/nixos.nix
+++ b/modules/grub/nixos.nix
@@ -13,7 +13,11 @@ let
         pkgs.makeFontsConf { fontDirectories = [ font.package ]; };
     } ''
       # Use fontconfig to select the correct .ttf or .otf file based on name
-      font=$(${lib.getExe' pkgs.fontconfig "fc-match"} --format=%{file})
+      font=$(
+        ${lib.getExe' pkgs.fontconfig "fc-match"}
+        ${lib.escapeShellArg font.name}
+        --format=%{file}
+      )
 
       # Convert to .pf2
       ${pkgs.grub2}/bin/grub-mkfont $font --output $out --size ${toString sizes.applications}