diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2020-02-07 22:49:24 +0100 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2020-02-10 12:01:28 +0100 |
commit | c5a0d66eb7cd17880b6238541d4189da6987e711 (patch) | |
tree | 01654fdff9c00f4ba63f8267d5cad49f856bfe21 /pkgs/data | |
parent | 96606b67faea751ac20c49043e247ed5822ab991 (diff) |
gohufont: split outputs into out and otb
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/gohufont/default.nix | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index ec36d9230f5bf..b331edf7aa1e3 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub -, mkfontdir, mkfontscale, bdf2psf, bdftopcf +, mkfontscale, bdf2psf, bdftopcf , fonttosfnt, libfaketime }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ mkfontdir mkfontscale bdf2psf bdftopcf + [ mkfontscale bdf2psf bdftopcf fonttosfnt libfaketime ]; @@ -33,33 +33,37 @@ stdenv.mkDerivation rec { done cd $build - # convert bdf fonts to pcf and otb + # convert bdf fonts to pcf for i in *.bdf $src/hidpi/*.bdf; do name=$(basename $i .bdf) bdftopcf -o "$name.pcf" "$i" - faketime -f "1970-01-01 00:00:01" fonttosfnt -v -o "$name.otb" "$i" || true + done + + # convert unicode bdf fonts to otb + for i in *-uni*.bdf $src/hidpi/*-uni*.bdf; do + name=$(basename $i .bdf) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" done ''; installPhase = '' # install the psf fonts (for the virtual console) fontDir="$out/share/consolefonts" - mkdir -p "$fontDir" - mv -t "$fontDir" psf/*.psf + install -D -m 644 -t "$fontDir" psf/*.psf - # install the pcf and otb fonts (for xorg applications) + # install the pcf fonts (for xorg applications) fontDir="$out/share/fonts/misc" - mkdir -p "$fontDir" - mv -t "$fontDir" *.pcf *.otb + install -D -m 644 -t "$fontDir" *.pcf + mkfontdir "$fontDir" - cd "$fontDir" - mkfontdir - mkfontscale + # install the otb fonts (for gtk applications) + fontDir="$otb/share/fonts/misc" + install -D -m 644 -t "$fontDir" *.otb + mkfontdir "$fontDir" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "028mq0j6w76isv4ycj1jzx7ih9d9cz5012np7f1pf3bvnvw3ajw2"; + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = '' |