From 1035f0a030b45bb58f1e69b1c6f9fa24efa2f808 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Sep 2019 07:56:42 -0500
Subject: [PATCH] spleen: 1.3.0 -> 1.5.0, mkfontdir for X11

---
 pkgs/data/fonts/spleen/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index f8830bbd211..c5dfc1e156f 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f80a082ffd4..7233b4b9b56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17244,7 +17244,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 { };