From e03fea0a1284f9da856c91e7d04bee39b9a30c3c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 10 Aug 2026 08:41:32 +0200
Subject: [PATCH 1/2] grub2: make work with upstream unifont structure

---
 pkgs/by-name/gr/grub2/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grub2/package.nix b/pkgs/by-name/gr/grub2/package.nix
index 0c8a57992686..a21d2f3257c4 100644
--- a/pkgs/by-name/gr/grub2/package.nix
+++ b/pkgs/by-name/gr/grub2/package.nix
@@ -670,7 +670,7 @@ stdenv.mkDerivation rec {
 
     ./bootstrap --no-git --gnulib-srcdir=${gnulib}
 
-    substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
+    substituteInPlace ./configure --replace-fail '/usr/share/fonts' '${unifont}/share/fonts'
   ''
   # build-grub-mkfont is built & run during build, need to find freetype for buildPlatform
   + lib.optionalString (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) ''

From 9bcda64afddd4e4e4b767147bba3f89f9e47056f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 10 Aug 2026 08:41:32 +0200
Subject: [PATCH 2/2] console-setup: make work with upstream unifont structure

---
 pkgs/by-name/co/console-setup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/console-setup/package.nix b/pkgs/by-name/co/console-setup/package.nix
index c064555207fb..86bb92949369 100644
--- a/pkgs/by-name/co/console-setup/package.nix
+++ b/pkgs/by-name/co/console-setup/package.nix
@@ -26,6 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     bdfresize
     otf2bdf
     perl
+    unifont
   ];
 
   makeFlags = [ "prefix=${placeholder "out"}" ];
@@ -35,8 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs .
     substituteInPlace Fonts/Makefile --replace-fail '/usr/share/fonts/truetype/dejavu/' '${dejavu_fonts}/share/fonts/truetype/'
-    ln -s ${unifont}/share/fonts/unifont.bdf Fonts/bdf
-    substituteInPlace Fonts/Makefile --replace-fail 'rm -f $(fntdir)/bdf/unifont.bdf' ""
+    substituteInPlace Fonts/Makefile --replace-fail '/usr/share/unifont/' '${unifont.doc}/share/unifont/'
   '';
 
   preBuild = "make -j$NIX_BUILD_CORES bdf";