From 95bbf889f7e27ea303180416fec779ded960f537 Mon Sep 17 00:00:00 2001 From: alexameen Date: Sat, 14 Nov 2020 00:55:22 -0600 Subject: [PATCH 1/2] Remove AdobeBlank-Regular.ttf from google-fonts package modified: default.nix --- pkgs/data/fonts/google-fonts/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 7a3b488212d..eabc1713a72 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -30,7 +30,11 @@ stdenv.mkDerivation { rm -rv ofl/comfortaa/*.ttf \ ofl/mavenpro/*.ttf \ ofl/muli/*.ttf \ - ofl/oswald/*.ttf + ofl/oswald/*.ttf \ + + # This abomination of a font causes crashes with `libfontconfig', + # It has an absurd number of symbols + rm -r ofl/adobeblank/ if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" From c39f4075532cdb446689f318799e19027b7ac70a Mon Sep 17 00:00:00 2001 From: alexameen Date: Sat, 14 Nov 2020 19:39:55 -0600 Subject: [PATCH 2/2] Made AdobeBlank-Regular.ttf available with google-fonts.adobeBlank --- pkgs/data/fonts/google-fonts/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index eabc1713a72..153f37c88e0 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation { pname = "google-fonts"; version = "2019-07-14"; + outputs = [ "out" "adobeBlank" ]; + src = fetchFromGitHub { owner = "google"; repo = "fonts"; @@ -30,11 +32,7 @@ stdenv.mkDerivation { rm -rv ofl/comfortaa/*.ttf \ ofl/mavenpro/*.ttf \ ofl/muli/*.ttf \ - ofl/oswald/*.ttf \ - - # This abomination of a font causes crashes with `libfontconfig', - # It has an absurd number of symbols - rm -r ofl/adobeblank/ + ofl/oswald/*.ttf if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" @@ -43,6 +41,9 @@ stdenv.mkDerivation { ''; installPhase = '' + adobeBlankDest=$adobeBlank/share/fonts/truetype + install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf + rm -r ofl/adobeblank dest=$out/share/fonts/truetype find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + '';