From d443f43656fc24521aad3cb9ad68a9b5d7771d4c Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 13 May 2023 14:10:56 +0300 Subject: [PATCH] Revert "carlito: 20130920 -> 20230309" This reverts commit 8050cacb9e1520ca3ad0298f6fa9961889b619d1. --- pkgs/data/fonts/carlito/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index db62cb0f1483..283eb21a175f 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,27 +1,25 @@ -{ lib, fetchFromGitHub, stdenvNoCC }: +{ lib, fetchurl, stdenvNoCC }: stdenvNoCC.mkDerivation rec { - pname = "carlito-unstable"; - version = "20230309"; + pname = "carlito"; + version = "20130920"; - src = fetchFromGitHub { - owner = "googlefonts"; - repo = "carlito"; - rev = "3a810cab78ebd6e2e4eed42af9e8453c4f9b850a"; - hash = "sha256-U4TvZZ7n7dr1/14oZkF1Eo96ZcdWIDWron70um77w+E="; + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; + sha256 = "sha256-S9ErbLwyHBzxbaduLFhcklzpVqCAZ65vbGTv9sz9r1o="; }; installPhase = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype - cp -v fonts/ttf/*.ttf $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; meta = with lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. - homepage = "https://github.com/googlefonts/carlito"; + homepage = "http://openfontlibrary.org/en/font/carlito"; description = "A sans-serif font metric-compatible with Microsoft Calibri"; longDescription = '' Carlito is a free font that is metric-compatible with the