From dfd4bb0ca8550b1915890f6b7b30e4ae8d054bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Fri, 23 Sep 2022 09:32:03 +0200
Subject: [PATCH] chore: get also otf from fonts

---
 configs/fonts.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/configs/fonts.nix b/configs/fonts.nix
index 48f699c..55b1896 100644
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -1,17 +1,12 @@
 {pkgs, ...}: let
-  zip-ttf = name: arguments: let
+  zip-font = name: arguments: let
     directory = pkgs.fetchzip arguments;
   in
     pkgs.runCommand name {} ''
-      mkdir -p $out/share/fonts/truetype
+      mkdir -p $out/share/fonts/{truetype,opentype,woff}
       ${pkgs.findutils}/bin/find ${directory} -name '*.ttf' -exec install '{}' $out/share/fonts/truetype \;
-    '';
-  zip-otf = name: arguments: let
-    directory = pkgs.fetchzip arguments;
-  in
-    pkgs.runCommand name {} ''
-      mkdir -p $out/share/fonts/opentype
       ${pkgs.findutils}/bin/find ${directory} -name '*.otf' -exec install '{}' $out/share/fonts/opentype \;
+      ${pkgs.findutils}/bin/find ${directory} -name '*.woff' -exec install '{}' $out/share/fonts/woff \;
     '';
   simple-ttf = name: arguments: let
     file = pkgs.fetchurl arguments;
@@ -21,25 +16,25 @@
       install ${file} $out/share/fonts/truetype
     '';
 
-  egyptianHiero = zip-ttf "EgyptianHiero" {
+  egyptianHiero = zip-font "EgyptianHiero" {
     url = "https://github.com/MKilani/Djehuty/archive/master.zip";
     sha256 = "0xaq16ysvxrkcn3264wkmm2ln0hpijpk4iq1n5i7d9gqhjhsav1x";
   };
-  antinoou = zip-ttf "Antinoou" {
+  antinoou = zip-font "Antinoou" {
     url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
     sha256 = "0jwihj08n4yrshcx07dnaml2x9yws6dgyjkvg19jqbz17drbp3sw";
     stripRoot = false;
   };
-  newGardiner = zip-ttf "NewGardiner" {
+  newGardiner = zip-font "NewGardiner" {
     url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
     sha256 = "1jd0qa6shh9pqqyig2w43m9l9rv1i50l73jzkhb6g6mqxbhb1mip";
     stripRoot = false;
   };
-  junicode2 = zip-otf "JunicodeTwo" {
+  junicode2 = zip-font "JunicodeTwo" {
     url = "https://github.com/psb1558/Junicode-font/archive/48bf476db278c844c67542b04d1e0e4c71f139d2.zip";
     sha256 = "1ryicc155vkvgv3315ddliigwa01afwyb4c4f6pnqcns03af001i";
   };
-  newAthenaUnicode = zip-ttf "NewAthenaUnicode" {
+  newAthenaUnicode = zip-font "NewAthenaUnicode" {
     url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
     sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
   };