public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/fonts/uni-vga/default.nix
+3 -6
View File
@@ -34,23 +34,20 @@ stdenv.mkDerivation {
'';
installPhase = ''
# install pcf (for X11 applications)
install -m 644 -D *.pcf.gz -t "$out/share/fonts"
# install pcf and otb (for X11 and GTK applications)
install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts"
mkfontdir "$out/share/fonts"
# install bdf font
install -m 644 -D *.bdf -t "$bdf/share/fonts"
mkfontdir "$bdf/share/fonts"
# install otb font (for GTK applications)
install -m 644 -D *.otb -t "$otb/share/fonts"
mkfontdir "$otb/share/fonts"
'' + optionalString stdenv.isLinux ''
# install psf (for linux virtual terminal)
install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
'';
outputs = [ "out" "bdf" "otb" ];
outputs = [ "out" "bdf" ];
meta = {
description = "Unicode VGA font";