From f41f53dc49d4d593bfeb977c05b8a730fd3654dd Mon Sep 17 00:00:00 2001
From: Emilio Perez <emilio.perez-juarez@diamond.ac.uk>
Date: Tue, 1 Sep 2020 15:38:06 +0100
Subject: [PATCH] nixos/fontdir: add option to decompress fonts

This will let Xwayland use the global font folder as font path
---
 nixos/modules/config/fonts/fontdir.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index be06991063c..282f2425b06 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@@ -10,6 +10,9 @@ let
     find ${toString config.fonts.fonts} -regex "$font_regexp" \
       -exec ln -sf -t "$out/share/X11/fonts" '{}' \;
     cd "$out/share/X11/fonts"
+    ${optionalString config.fonts.fontDir.decompressFonts ''
+      ${pkgs.gzip}/bin/gunzip -f *.gz
+    ''}
     ${pkgs.xorg.mkfontscale}/bin/mkfontscale
     ${pkgs.xorg.mkfontdir}/bin/mkfontdir
     cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias
@@ -31,6 +34,14 @@ in
         '';
       };
 
+      decompressFonts = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to decompress fonts in
+          <filename>/run/current-system/sw/share/X11/fonts</filename>.
+        '';
+      };
 
     };
   };