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

Merge pull request #79671 from rnhmjoj/spleen

Browse Source 
spleen: install otf font
This commit is contained in:
Daniel Schaefer 2020-02-11 20:37:32 +01:00 committed by GitHub
commit 9b2d529062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/data/fonts/spleen/default.nix
View File

@ -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";

2
pkgs/top-level/all-packages.nix
View File

@ -17924,7 +17924,7 @@ in
source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese;
spleen = callPackage ../data/fonts/spleen { inherit (xorg) mkfontdir; };
spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; };
stilo-themes = callPackage ../data/themes/stilo { };