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 -5
View File
@@ -14,15 +14,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ mkfontscale ];
installPhase = ''
install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc"
install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"
install -m 644 -D psf/*.psf -t "$out/share/consolefonts"
install -m 644 -D otb/*.otb -t "$otb/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "Bitmapped programming font based on Tamsyn";
longDescription = ''