google-fonts: 2019-07-14 -> unstable-2021-01-19
This commit is contained in:
parent
1ca55e5c3b
commit
605f8ab4bf
@ -1,16 +1,18 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "google-fonts";
|
pname = "google-fonts";
|
||||||
version = "2019-07-14";
|
version = "unstable-2021-01-19";
|
||||||
|
|
||||||
outputs = [ "out" "adobeBlank" ];
|
outputs = [ "out" "adobeBlank" ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "fonts";
|
repo = "fonts";
|
||||||
rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a";
|
rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d";
|
||||||
sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs";
|
sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix";
|
||||||
};
|
};
|
||||||
|
|
||||||
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
|
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
|
||||||
@ -21,18 +23,9 @@ stdenv.mkDerivation {
|
|||||||
# directories. This causes non-determinism in the install since
|
# directories. This causes non-determinism in the install since
|
||||||
# the installation order of font files with the same name is not
|
# the installation order of font files with the same name is not
|
||||||
# fixed.
|
# fixed.
|
||||||
rm -rv ofl/alefhebrew \
|
rm -rv ofl/cabincondensed \
|
||||||
ofl/misssaintdelafield \
|
ofl/signikanegative \
|
||||||
ofl/mrbedford \
|
ofl/signikanegativesc
|
||||||
ofl/siamreap \
|
|
||||||
ofl/terminaldosislight
|
|
||||||
|
|
||||||
# See comment above, the structure of these is a bit odd
|
|
||||||
# We keep the ofl/<font>/static/ variants
|
|
||||||
rm -rv ofl/comfortaa/*.ttf \
|
|
||||||
ofl/mavenpro/*.ttf \
|
|
||||||
ofl/muli/*.ttf \
|
|
||||||
ofl/oswald/*.ttf
|
|
||||||
|
|
||||||
if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
|
if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
|
||||||
echo "error: duplicate font names"
|
echo "error: duplicate font names"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user