pkgs/data/fonts: merge back the split otb output

Since the Pango issue 457[1] has been fixed and Nixpkgs patched, it's no
longer necessary to keep X11 and .otb fonts in separate outputs (previously
they would cause application to display broken fonts).

[1]: https://gitlab.gnome.org/GNOME/pango/-/issues/457
This commit is contained in:
rnhmjoj
2020-08-22 09:45:05 +02:00
parent fcd447bfed
commit 6545e5a506
15 changed files with 25 additions and 81 deletions
+2 -9
View File
@@ -52,19 +52,12 @@ stdenv.mkDerivation rec {
fontDir="$out/share/consolefonts"
install -D -m 644 -t "$fontDir" psf/*.psf
# install the pcf fonts (for xorg applications)
# install the pcf and otb fonts (for X11,GTK applications)
fontDir="$out/share/fonts/misc"
install -D -m 644 -t "$fontDir" *.pcf
mkfontdir "$fontDir"
# install the otb fonts (for gtk applications)
fontDir="$otb/share/fonts/misc"
install -D -m 644 -t "$fontDir" *.otb
install -D -m 644 -t "$fontDir" *.pcf *.otb
mkfontdir "$fontDir"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = ''
A monospace bitmap font well suited for programming and terminal use