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:
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
install -m 644 -D psf/*.psf -t "$fontDir"
|
||||
|
||||
# install otb fonts
|
||||
fontDir="$otb/share/fonts/X11/misc"
|
||||
fontDir="$out/share/fonts/X11/misc"
|
||||
install -m 644 -D otb/*.otb -t "$fontDir"
|
||||
mkfontdir "$fontDir"
|
||||
'';
|
||||
@@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
outputs = [ "out" "otb" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Monospace bitmap screen fonts for X11";
|
||||
homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/";
|
||||
|
||||
Reference in New Issue
Block a user