summary refs log tree commit diff
path: root/pkgs/data/fonts/tamsyn
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2020-08-21 14:18:18 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2020-08-22 09:45:05 +0200
commit6545e5a5062f2da149d665cfc897d7e0bc19ff3e (patch)
tree683b1ab8292d03fae16dba6c24360901490c154e /pkgs/data/fonts/tamsyn
parentfcd447bfed52b95d8e63314c0e8ab3c01649dfdc (diff)
downloadnixpkgs-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/tamsyn')
-rw-r--r--pkgs/data/fonts/tamsyn/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix
index 2738925478f..4d1e58a6bb3 100644
--- a/pkgs/data/fonts/tamsyn/default.nix
+++ b/pkgs/data/fonts/tamsyn/default.nix
@@ -29,15 +29,11 @@ in stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
+    install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts/misc"
     install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
-    install -m 644 -D *.otb    -t "$otb/share/fonts/misc"
     mkfontdir "$out/share/fonts/misc"
-    mkfontdir "$otb/share/fonts/misc"
   '';
 
-  outputs = [ "out" "otb" ];
-
   meta = with stdenv.lib; {
     description = "A monospace bitmap font aimed at programmers";
     longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at