Skip to content

Commit

Permalink
tamzen: 1.11.4 -> 1.11.5
Browse files Browse the repository at this point in the history
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]: NixOS#75160
[3]: sunaku/tamzen-font#25

(cherry picked from commit 1975e4b)
  • Loading branch information
wishfort36 authored and dtzWill committed Jun 5, 2020
1 parent 29e1a4d commit 4c2ec6c
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions pkgs/data/fonts/tamzen/default.nix
Original file line number Diff line number Diff line change
@@ -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"
'';
Expand Down

0 comments on commit 4c2ec6c

Please sign in to comment.