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/terminus-font | |
| 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/terminus-font')
| -rw-r--r-- | pkgs/data/fonts/terminus-font/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index fb120e5eec6..bbde1dd252c 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -35,14 +35,12 @@ stdenv.mkDerivation rec { postInstall = '' # install otb fonts (for GTK applications) - install -m 644 -D *.otb -t "$otb/share/fonts/misc"; - mkfontdir "$otb/share/fonts/misc" + install -m 644 -D *.otb -t "$out/share/fonts/misc"; + mkfontdir "$out/share/fonts/misc" ''; installTargets = [ "install" "fontdir" ]; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "A clean fixed width font"; longDescription = '' |