diff options
author | wishfort36 <42300264+wishfort36@users.noreply.github.com> | 2020-05-24 21:49:52 +0200 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-05-27 09:01:22 -0700 |
commit | 1975e4b2ec7b1e218e691b65aee79a643f1fa3dc (patch) | |
tree | f105b71b2eb51abc58628a7ebaaa5301e4a95954 /pkgs/data/fonts/tamzen | |
parent | f17888bf0f3537be86d01ee61e7ae58903162dac (diff) | |
download | nixpkgs-1975e4b2ec7b1e218e691b65aee79a643f1fa3dc.tar nixpkgs-1975e4b2ec7b1e218e691b65aee79a643f1fa3dc.tar.gz nixpkgs-1975e4b2ec7b1e218e691b65aee79a643f1fa3dc.tar.bz2 nixpkgs-1975e4b2ec7b1e218e691b65aee79a643f1fa3dc.tar.lz nixpkgs-1975e4b2ec7b1e218e691b65aee79a643f1fa3dc.tar.xz nixpkgs-1975e4b2ec7b1e218e691b65aee79a643f1fa3dc.tar.zst nixpkgs-1975e4b2ec7b1e218e691b65aee79a643f1fa3dc.zip |
tamzen: 1.11.4 -> 1.11.5
Pango doesn't support PCF and BDF fonts since v1.44 [1], but still supports OTB fonts. As such, we've had to generate OTB fonts for fonts that don't supply them [2], including tamzen. As of v1.11.5, tamzen supplies its own OTB fonts [3], so we don't need to make them ourselves. [1]: https://gitlab.gnome.org/GNOME/pango/-/issues/386 [2]: https://github.com/NixOS/nixpkgs/issues/75160 [3]: https://github.com/sunaku/tamzen-font/issues/25
Diffstat (limited to 'pkgs/data/fonts/tamzen')
-rw-r--r-- | pkgs/data/fonts/tamzen/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index c4a2be00d94..6ecc03d7310 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -1,28 +1,22 @@ -{ fetchFromGitHub, fontforge, mkfontscale, stdenv }: +{ fetchFromGitHub, mkfontscale, stdenv }: stdenv.mkDerivation rec { pname = "tamzen-font"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "sunaku"; repo = "tamzen-font"; rev = "Tamzen-${version}"; - sha256 = "17kgmvg6q32mqhx9g44hjvzv0si0mnpprga4z7na930g2zdd8846"; + sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; }; - nativeBuildInputs = [ fontforge mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' - # convert pcf fonts to otb - for i in pcf/*.pcf; do - name=$(basename "$i" .pcf) - fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otb\")" - done - install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc" install -m 644 -D psf/*.psf -t "$out/share/consolefonts" - install -m 644 -D *.otb -t "$otb/share/fonts/misc" + install -m 644 -D otb/*.otb -t "$otb/share/fonts/misc" mkfontdir "$out/share/fonts/misc" mkfontdir "$otb/share/fonts/misc" ''; |