From 77a7b33804dffbdaa1d513351d865b0c6942abed Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 14 Jun 2021 11:50:23 +0100 Subject: [PATCH] google-fonts: unstable-2021-01-19 -> unstable-2021-06-12 Also move to `stdenvNoCC` to reduce rebuilds --- pkgs/data/fonts/google-fonts/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 210902a0e71..9689fddd391 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,22 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2021-01-19"; + version = "unstable-2021-06-12"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d"; - sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix"; + rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc"; + sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM="; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = '' # These directories need to be removed because they contain # older or duplicate versions of fonts also present in other @@ -33,6 +29,8 @@ stdenv.mkDerivation { fi ''; + dontBuild = true; + installPhase = '' adobeBlankDest=$adobeBlank/share/fonts/truetype install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf