cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #79686 from emilazy/add-merriweather-fonts

Browse source 
merriweather{,-sans}: add new fonts
This commit is contained in:
Yegor Timoshenko 2020-02-24 21:04:27 +03:00 committed by GitHub
commit 2ee99b4ba6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/data/fonts/merriweather-sans/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ stdenvNoCC
, lib
, fetchFromGitHub
}:
stdenvNoCC.mkDerivation rec {
pname = "merriweather-sans";
version = "1.008";
src = fetchFromGitHub {
owner = "SorkinType";
repo = "Merriweather-Sans";
rev = "8a1b078e3aeec6aecc856c3422898816af9b9dc7";
sha256 = "1f6a64bv4b4b1v3g2pgrzxcys8rk12wq6wfxamgzligcq5fxaffd";
};
# TODO: it would be nice to build this from scratch, but lots of
# Python dependencies to package (fontmake, gftools)
installPhase = ''
install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
# TODO: install variable version?
'';
meta = with lib; {
homepage = "https://github.com/SorkinType/Merriweather-Sans";
description = "Merriweather Sans is a low-contrast semi-condensed sans-serif text typeface family designed to be pleasant to read at very small sizes";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ emily ];
};
}

35
pkgs/data/fonts/merriweather/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ stdenvNoCC
, lib
, fetchFromGitHub
}:
stdenvNoCC.mkDerivation rec {
pname = "merriweather";
version = "2.005";
src = fetchFromGitHub {
owner = "SorkinType";
repo = "Merriweather";
rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a";
sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29";
};
# TODO: it would be nice to build this from scratch, but lots of
# Python dependencies to package (fontmake, gftools)
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf
install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
# TODO: install variable version?
'';
meta = with lib; {
homepage = "https://github.com/SorkinType/Merriweather";
description = "Merriweather was designed to be a text face that is pleasant to read on screens";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ emily ];
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -1970,6 +1970,10 @@ in
opendune = callPackage ../games/opendune { };
merriweather = callPackage ../data/fonts/merriweather { };
merriweather-sans = callPackage ../data/fonts/merriweather-sans { };
meson = callPackage ../development/tools/build-managers/meson { };
meson-tools = callPackage ../misc/meson-tools { };