diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/data/fonts/spleen | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/data/fonts/spleen')
-rw-r--r-- | nixpkgs/pkgs/data/fonts/spleen/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/data/fonts/spleen/default.nix b/nixpkgs/pkgs/data/fonts/spleen/default.nix index 3e843e30f5ee..c3cfec244e3a 100644 --- a/nixpkgs/pkgs/data/fonts/spleen/default.nix +++ b/nixpkgs/pkgs/data/fonts/spleen/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchurl, mkfontdir }: +{ lib, fetchurl, mkfontscale }: let pname = "spleen"; - version = "1.6.0"; + version = "1.7.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -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 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg"; meta = with lib; { description = "Monospaced bitmap fonts"; |