@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "google-fonts-${version}";
5− version = "2018-07-13";
5+ version = "2019-07-14";
66
77 src = fetchFromGitHub {
88 owner = "google";
99 repo = "fonts";
10− rev = "3ca591dae7372a26e254ec6d22e7b453813b9530";
11− sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr";
10+ rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a";
11+ sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs";
1212 };
1313
1414 outputHashAlgo = "sha256";
@@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
2929 ofl/siamreap \
3030 ofl/terminaldosislight
3131
32+ # See comment above, the structure of these is a bit odd
33+ # We keep the ofl/<font>/static/ variants
34+ rm -rv ofl/comfortaa/*.ttf \
35+ ofl/mavenpro/*.ttf \
36+ ofl/muli/*.ttf \
37+ ofl/oswald/*.ttf
38+
3239 if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
3340 echo "error: duplicate font names"
3441 exit 1