diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2020-08-21 14:18:18 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2020-08-22 09:45:05 +0200 |
| commit | 6545e5a5062f2da149d665cfc897d7e0bc19ff3e (patch) | |
| tree | 683b1ab8292d03fae16dba6c24360901490c154e /pkgs/data/fonts/gohufont | |
| parent | fcd447bfed52b95d8e63314c0e8ab3c01649dfdc (diff) | |
| download | nixpkgs-6545e5a5062f2da149d665cfc897d7e0bc19ff3e.tar nixpkgs-6545e5a5062f2da149d665cfc897d7e0bc19ff3e.tar.gz nixpkgs-6545e5a5062f2da149d665cfc897d7e0bc19ff3e.tar.bz2 nixpkgs-6545e5a5062f2da149d665cfc897d7e0bc19ff3e.tar.lz nixpkgs-6545e5a5062f2da149d665cfc897d7e0bc19ff3e.tar.xz nixpkgs-6545e5a5062f2da149d665cfc897d7e0bc19ff3e.tar.zst nixpkgs-6545e5a5062f2da149d665cfc897d7e0bc19ff3e.zip | |
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
Diffstat (limited to 'pkgs/data/fonts/gohufont')
| -rw-r--r-- | pkgs/data/fonts/gohufont/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index e2361ef8163..ac82c82ae3d 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -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 |