nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70688 from dtzWill/update/spleen-1.5.0

Browse Source 
spleen: 1.3.0 -> 1.5.0, mkfontdir
This commit is contained in:
Will Dietz 2019-10-14 18:54:28 -05:00 committed by GitHub
commit 886bca0af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ lib, fetchurl }:
{ lib, fetchurl, mkfontdir }:
let
pname = "spleen";
version = "1.3.0";
version = "1.5.0";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@ -12,11 +12,13 @@ in fetchurl {
postFetch = ''
tar xvf $downloadedFile --strip=1
d="$out/share/fonts/X11/misc/spleen"
gzip -n9 *.pcf
install -Dm644 *.{pcf.gz,psfu,bdf} -t $d
install -m644 fonts.alias-spleen $d/fonts.alias
# create fonts.dir so NixOS xorg module adds to fp
${mkfontdir}/bin/mkfontdir $d
'';
sha256 = "1l1ksl8xnz1yh7jl8h2g25a7wfm9xgj3lay8ddqzlxzydkkm110q";
sha256 = "13ndyw1m6c778k7jr7qwbfg28gqmpcgksprn2mjgsv75wvy51z19";
meta = with lib; {
description = "Monospaced bitmap fonts";

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

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