fonts: refactor system.build.fonts

Process substitution behaves better with variables and it's good practice to use `lib.escapeShellArgs`.
kamushadenes · Jul 8, 2024 · 1301cfc · 1301cfc
1 parent e8dcea5
commit 1301cfc
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
@@ -41,9 +41,14 @@ in
       ''
         mkdir -p $out/Library/Fonts
         font_regexp='.*\.\(ttf\|ttc\|otf\|dfont\)'
-        find -L ${toString cfg.fonts} -regex "$font_regexp" -type f -print0 | while IFS= read -rd "" f; do
-            ln -sf "$f" $out/Library/Fonts
-        done
+        while IFS= read -rd "" f; do
+          ln -sf "$f" "$out/Library/Fonts"
+        done < <(
+          find -L ${lib.escapeShellArgs cfg.fonts} \
+            -type f \
+            -regex "$font_regexp" \
+            -print0
+        )
       '';
 
     system.activationScripts.fonts.text = lib.optionalString cfg.fontDir.enable ''