Merge pull request #200953 from DeeUnderscore/fix/montserrat

This commit is contained in:
Sandro 2022-11-21 02:54:19 +01:00 committed by GitHub
commit e08821f0b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 17 deletions

View File

@ -1,22 +1,27 @@
{ lib, fetchFromGitHub }:
let
version = "1.008";
fetchFromGitHub rec {
pname = "b612";
in fetchFromGitHub {
name = "${pname}-font-${version}";
version = "1.008";
owner = "polarsys";
repo = "b612";
rev = version;
postFetch = ''
tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/truetype/${pname}
cp fonts/ttf/*.ttf $out/share/fonts/truetype/${pname}
mkdir -p $out/share/fonts/truetype
mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk=";
meta = with lib; {
homepage = "http://b612-font.com/";
homepage = "https://b612-font.com/";
description = "Highly legible font family for use on aircraft cockpit screens";
longDescription = ''
B612 is the result of a research project initiated by Airbus. The font

View File

@ -1,21 +1,25 @@
{ lib, fetchFromGitHub }:
let
fetchFromGitHub rec {
pname = "montserrat";
version = "7.222";
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "JulietaUla";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0=";
postFetch = ''
tar xf $downloadedFile --strip 1
install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf
install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf
install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff
install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2
mkdir -p $out/share/fonts/{otf,ttf,woff,woff2}
mv $out/fonts/otf/*.otf $out/share/fonts/otf
mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf
mv $out/fonts/webfonts/*.woff $out/share/fonts/woff
mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
meta = with lib; {