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
+1 -7
View File
@@ -38,16 +38,10 @@ stdenv.mkDerivation rec {
installPhase = ''
fontDir="$out/share/fonts/misc"
install -m 644 -D out/* -t "$fontDir"
mkfontdir "$fontDir"
fontDir="$otb/share/fonts/misc"
install -m 644 -D *.otb -t "$fontDir"
install -m 644 -D *.otb out/* -t "$fontDir"
mkfontdir "$fontDir"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "A nice bitmap font, readable even at small sizes";
longDescription = ''