about summary refs log tree commit diff
path: root/pkgs/data/fonts
diff options
context:
space:
mode:
authorDaniel Schaefer <git@danielschaefer.me>2020-02-11 20:37:32 +0100
committerGitHub <noreply@github.com>2020-02-11 20:37:32 +0100
commit9b2d529062ea7e93268fe6526eb6cc1c71a61d30 (patch)
tree4d85ceecb31df1a40592d913610a113fc635db20 /pkgs/data/fonts
parentf528d880e18eff7bd5e636550452cf92fcf1369d (diff)
parent8ada47545000adcc97d56f19dd9ea61a894d8e7a (diff)
downloadnixlib-9b2d529062ea7e93268fe6526eb6cc1c71a61d30.tar
nixlib-9b2d529062ea7e93268fe6526eb6cc1c71a61d30.tar.gz
nixlib-9b2d529062ea7e93268fe6526eb6cc1c71a61d30.tar.bz2
nixlib-9b2d529062ea7e93268fe6526eb6cc1c71a61d30.tar.lz
nixlib-9b2d529062ea7e93268fe6526eb6cc1c71a61d30.tar.xz
nixlib-9b2d529062ea7e93268fe6526eb6cc1c71a61d30.tar.zst
nixlib-9b2d529062ea7e93268fe6526eb6cc1c71a61d30.zip
Merge pull request #79671 from rnhmjoj/spleen
spleen: install otf font
Diffstat (limited to 'pkgs/data/fonts')
-rw-r--r--pkgs/data/fonts/spleen/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 3e843e30f5ee..42645fda664d 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, mkfontdir }:
+{ lib, fetchurl, mkfontscale }:
 
 let
   pname = "spleen";
@@ -11,14 +11,15 @@ in fetchurl {
   recursiveHash = true;
   postFetch = ''
     tar xvf $downloadedFile --strip=1
-    d="$out/share/fonts/X11/misc/spleen"
-    install -Dm644 *.{pcf.gz,psfu,bdf} -t $d
+    d="$out/share/fonts/misc"
+    install -D -m 644 *.{pcf,bdf,otf} -t "$d"
+    install -D -m 644 *.psfu -t "$out/share/consolefonts"
     install -m644 fonts.alias-spleen $d/fonts.alias
 
     # create fonts.dir so NixOS xorg module adds to fp
-    ${mkfontdir}/bin/mkfontdir $d
+    ${mkfontscale}/bin/mkfontdir "$d"
   '';
-  sha256 = "0h9gj7syn87hl5rhwckih92r228zac6b1dvh3034caml8ad3fyla";
+  sha256 = "0x1xiw4gyfkyvwqg0f47rl92zq76d0c6jfncdnq8m2wwpxz9697b";
 
   meta = with lib; {
     description = "Monospaced bitmap fonts";