From 9317838ef051a228c44bc4bbed468e2ff1dc1436 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 22 Aug 2025 15:09:08 -0400
Subject: [PATCH] xo-umbrella: build: fix fonts + glibc + libstdc++

---
 default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/default.nix b/default.nix
index ef577db0..a4417cd1 100644
--- a/default.nix
+++ b/default.nix
@@ -187,6 +187,16 @@ let
   };
 in
 
+let
+  fonts = pkgs.makeFontsConf {
+    fontDirectories = [
+      pkgs.inconsolata-lgc
+      pkgs.noto-fonts
+      pkgs.noto-fonts-emoji
+      pkgs.dejavu_fonts
+    ];
+  };
+in
 pkgs.mkShell {
   # maybe should create a python environment:
   #   let
@@ -255,6 +265,8 @@ pkgs.mkShell {
 #    pkgs.nixGL.nixGLNvidia
 #    pkgs.nixGL.nixGLMesa
     pkgs.libGL
+    pkgs.stdenv.cc.cc.lib
+    pkgs.glibc
 
     # fonts for imgui
     pkgs.gucharmap
@@ -288,10 +300,14 @@ pkgs.mkShell {
     # just for info
     export mesa_drivers=${pkgs.mesa.drivers}
 
+    export FONTCONFIG_FILE=${fonts}
     export FONTCONFIG_PATH=${pkgs.fontconfig.out}/etc/fonts
     export NOTO_FONTS_PATH=${pkgs.noto-fonts}/share/fonts
     export DEJAVU_FONTS_PATH=${pkgs.dejavu_fonts}/share/fonts
 
+    # refresh font cache
+    ${pkgs.fontconfig}/bin/fc-cache -fv
+
     echo "FONTCONFIG_PATH=$FONTCONFIG_PATH"
     echo "NOTO_FONTS_PATH=$NOTO_FONTS_PATH"