b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

google-fonts: unstable-2021-01-19 -> unstable-2021-06-12

Browse source 
Also move to `stdenvNoCC` to reduce rebuilds
This commit is contained in:
06kellyjac 2021-06-14 11:50:23 +01:00
parent 028f57303c
commit 77a7b33804
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/data/fonts/google-fonts/default.nix
View file

@ -1,22 +1,18 @@
{ lib { lib, stdenvNoCC, fetchFromGitHub }:
, stdenv
, fetchFromGitHub }:
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
pname = "google-fonts"; pname = "google-fonts";
version = "unstable-2021-01-19"; version = "unstable-2021-06-12";
outputs = [ "out" "adobeBlank" ]; outputs = [ "out" "adobeBlank" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "fonts"; repo = "fonts";
rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d"; rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc";
sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix"; sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM=";
}; };
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
patchPhase = '' patchPhase = ''
# These directories need to be removed because they contain # These directories need to be removed because they contain
# older or duplicate versions of fonts also present in other # older or duplicate versions of fonts also present in other
@ -33,6 +29,8 @@ stdenv.mkDerivation {
fi fi
''; '';
dontBuild = true;
installPhase = '' installPhase = ''
adobeBlankDest=$adobeBlank/share/fonts/truetype adobeBlankDest=$adobeBlank/share/fonts/truetype
install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf