git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79686 from emilazy/add-merriweather-fonts

merriweather{,-sans}: add new fonts

commit2ee99b4ba6dcc6ebd7c70e4f325a4e7f2dcabb8a authorYegor Timoshenko <yegortimoshenko@riseup.net> dateMon 24 Feb 2020, 21:04 (7 years ago) parentd6b692f7f1ab05
3 files changed+73
pkgs/data/fonts/merriweather-sans/default.nix+34 pkgs/data/fonts/merriweather/default.nix+35 pkgs/top-level/all-packages.nix+4
pkgs/data/fonts/merriweather-sans/default.nixnew file+34
@@ -0,0 +1,34 @@
1+{ stdenvNoCC
2+, lib
3+, fetchFromGitHub
4+}:
5+
6+stdenvNoCC.mkDerivation rec {
7+ pname = "merriweather-sans";
8+ version = "1.008";
9+
10+ src = fetchFromGitHub {
11+ owner = "SorkinType";
12+ repo = "Merriweather-Sans";
13+ rev = "8a1b078e3aeec6aecc856c3422898816af9b9dc7";
14+ sha256 = "1f6a64bv4b4b1v3g2pgrzxcys8rk12wq6wfxamgzligcq5fxaffd";
15+ };
16+
17+ # TODO: it would be nice to build this from scratch, but lots of
18+ # Python dependencies to package (fontmake, gftools)
19+
20+ installPhase = ''
21+ install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
22+ install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
23+ install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
24+ # TODO: install variable version?
25+ '';
26+
27+ meta = with lib; {
28+ homepage = "https://github.com/SorkinType/Merriweather-Sans";
29+ description = "Merriweather Sans is a low-contrast semi-condensed sans-serif text typeface family designed to be pleasant to read at very small sizes";
30+ license = licenses.ofl;
31+ platforms = platforms.all;
32+ maintainers = with maintainers; [ emily ];
33+ };
34+}
pkgs/data/fonts/merriweather/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ stdenvNoCC
2+, lib
3+, fetchFromGitHub
4+}:
5+
6+stdenvNoCC.mkDerivation rec {
7+ pname = "merriweather";
8+ version = "2.005";
9+
10+ src = fetchFromGitHub {
11+ owner = "SorkinType";
12+ repo = "Merriweather";
13+ rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a";
14+ sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29";
15+ };
16+
17+ # TODO: it would be nice to build this from scratch, but lots of
18+ # Python dependencies to package (fontmake, gftools)
19+
20+ installPhase = ''
21+ install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf
22+ install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
23+ install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
24+ install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
25+ # TODO: install variable version?
26+ '';
27+
28+ meta = with lib; {
29+ homepage = "https://github.com/SorkinType/Merriweather";
30+ description = "Merriweather was designed to be a text face that is pleasant to read on screens";
31+ license = licenses.ofl;
32+ platforms = platforms.all;
33+ maintainers = with maintainers; [ emily ];
34+ };
35+}
pkgs/top-level/all-packages.nix+4
@@ -1970,6 +1970,10 @@ in
19701970
19711971 opendune = callPackage ../games/opendune { };
19721972
1973+ merriweather = callPackage ../data/fonts/merriweather { };
1974+
1975+ merriweather-sans = callPackage ../data/fonts/merriweather-sans { };
1976+
19731977 meson = callPackage ../development/tools/build-managers/meson { };
19741978
19751979 meson-tools = callPackage ../misc/meson-tools { };