JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gohufont: split outputs into out and otb

Browse Source
This commit is contained in:
rnhmjoj 2020-02-07 22:49:24 +01:00
parent 96606b67fa
commit c5a0d66eb7
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/data/fonts/gohufont/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub { stdenv, fetchurl, fetchFromGitHub
, mkfontdir, mkfontscale, bdf2psf, bdftopcf , mkfontscale, bdf2psf, bdftopcf
, fonttosfnt, libfaketime , fonttosfnt, libfaketime
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = nativeBuildInputs =
[ mkfontdir mkfontscale bdf2psf bdftopcf [ mkfontscale bdf2psf bdftopcf
fonttosfnt libfaketime fonttosfnt libfaketime
]; ];
@ -33,33 +33,37 @@ stdenv.mkDerivation rec {
done done
cd $build cd $build
# convert bdf fonts to pcf and otb # convert bdf fonts to pcf
for i in *.bdf $src/hidpi/*.bdf; do for i in *.bdf $src/hidpi/*.bdf; do
name=$(basename $i .bdf) name=$(basename $i .bdf)
bdftopcf -o "$name.pcf" "$i" 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 done
''; '';
installPhase = '' installPhase = ''
# install the psf fonts (for the virtual console) # install the psf fonts (for the virtual console)
fontDir="$out/share/consolefonts" fontDir="$out/share/consolefonts"
mkdir -p "$fontDir" install -D -m 644 -t "$fontDir" psf/*.psf
mv -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" fontDir="$out/share/fonts/misc"
mkdir -p "$fontDir" install -D -m 644 -t "$fontDir" *.pcf
mv -t "$fontDir" *.pcf *.otb mkfontdir "$fontDir"
cd "$fontDir" # install the otb fonts (for gtk applications)
mkfontdir fontDir="$otb/share/fonts/misc"
mkfontscale install -D -m 644 -t "$fontDir" *.otb
mkfontdir "$fontDir"
''; '';
outputHashAlgo = "sha256"; outputs = [ "out" "otb" ];
outputHashMode = "recursive";
outputHash = "028mq0j6w76isv4ycj1jzx7ih9d9cz5012np7f1pf3bvnvw3ajw2";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = '' description = ''

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

@ -17494,7 +17494,7 @@ in
geolite-legacy = callPackage ../data/misc/geolite-legacy { }; geolite-legacy = callPackage ../data/misc/geolite-legacy { };
gohufont = callPackage ../data/fonts/gohufont gohufont = callPackage ../data/fonts/gohufont
{ inherit (buildPackages.xorg) fonttosfnt mkfontdir; }; { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { }; gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };