summary refs log tree commit diff
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2020-02-16 14:01:52 +0100
committerrnhmjoj <rnhmjoj@inventati.org>2020-02-16 14:58:59 +0100
commit128030139e5aea981d308708005cfb81ebb8676a (patch)
treef537a03b3df326a6e49fad984a141673a3e85e3f
parent37d9b45b04033a5458c151430717f10f77a4f292 (diff)
downloadnixpkgs-128030139e5aea981d308708005cfb81ebb8676a.tar
nixpkgs-128030139e5aea981d308708005cfb81ebb8676a.tar.gz
nixpkgs-128030139e5aea981d308708005cfb81ebb8676a.tar.bz2
nixpkgs-128030139e5aea981d308708005cfb81ebb8676a.tar.lz
nixpkgs-128030139e5aea981d308708005cfb81ebb8676a.tar.xz
nixpkgs-128030139e5aea981d308708005cfb81ebb8676a.tar.zst
nixpkgs-128030139e5aea981d308708005cfb81ebb8676a.zip
tewi-font: generate otb and split output
-rw-r--r--pkgs/data/fonts/tewi/default.nix28
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 25 insertions, 6 deletions
diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix
index c3c88dd08c4..6245032246c 100644
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, python3, bdftopcf, mkfontscale }:
+{ stdenv, fetchFromGitHub, python3
+, bdftopcf, mkfontscale
+, libfaketime, fonttosfnt
+}:
 
 stdenv.mkDerivation rec {
   pname = "tewi-font";
@@ -11,12 +14,12 @@ stdenv.mkDerivation rec {
     sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j";
   };
 
-  nativeBuildInputs = [ python3 bdftopcf mkfontscale ];
+  nativeBuildInputs =
+    [ python3 bdftopcf mkfontscale
+      libfaketime fonttosfnt
+    ];
 
   postPatch = ''
-    # do not update fontconfig cache
-    sed '32,33d' -i Makefile
-
     # make gzip deterministic
     sed 's/gzip -9/gzip -9 -n/g' -i Makefile
 
@@ -24,12 +27,27 @@ stdenv.mkDerivation rec {
     patchShebangs scripts/merge
   '';
 
+  postBuild = ''
+    # convert bdf fonts to otb
+    for i in *.bdf; do
+      name=$(basename "$i" .bdf)
+      faketime -f "1970-01-01 00:00:01" \
+      fonttosfnt -v -o "$name.otb" "$i"
+    done
+  '';
+
   installPhase = ''
     fontDir="$out/share/fonts/misc"
     install -m 644 -D out/* -t "$fontDir"
     mkfontdir "$fontDir"
+
+    fontDir="$otb/share/fonts/misc"
+    install -m 644 -D *.otb -t "$fontDir"
+    mkfontdir "$fontDir"
   '';
 
+  outputs = [ "out" "otb" ];
+
   meta = with stdenv.lib; {
     description = "A nice bitmap font, readable even at small sizes";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1b..135e059186d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25475,7 +25475,8 @@ in
 
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
-  tewi-font = callPackage ../data/fonts/tewi  {};
+  tewi-font = callPackage ../data/fonts/tewi
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;