Fixed font

This commit is contained in:
Jan-Bulthuis 2025-02-11 19:30:26 +01:00
parent 555c48dc3b
commit 4400dc070f
2 changed files with 26 additions and 13 deletions

View File

@ -12,25 +12,39 @@ pkgs.stdenv.mkDerivation {
''; '';
buildInputs = with pkgs; [ buildInputs = with pkgs; [
dina-font.bdf dina-font
# ttf2psf
bdf2psf bdf2psf
# kbd
]; ];
# buildPhase = ''
# # Get the base Dina otb font
# cp ${pkgs.dina-font}/share/fonts/misc/DinaMedium9.otb ./dina.otb
# # Create the character set
# cp ${pkgs.ttf2psf}/share/ttf2psf/ascii
# # Convert to psfu
# ttf2psu -g -c ${pkgs.ttf2psf}/share/ttf2psf/ -e ${pkgs.ttf2psf}/share/ttf2psf/standard.equivalents dina.otb dina.psfu.gz
# '';
buildPhase = '' buildPhase = ''
cp ${pkgs.dina-font.bdf}/share/fonts/misc/Dina_r400-9.bdf ./dina.bdf # Get the base Dina font
cp ${pkgs.dina-font.bdf}/share/fonts/misc/Dina_r400-10.bdf ./dina.bdf
# Set the AVERAGE_WIDTH property on the font # Set the AVERAGE_WIDTH property on the font
sed 's/STARTPROPERTIES 16/STARTPROPERTIES 17\ sed 's/STARTPROPERTIES 16/STARTPROPERTIES 17\
AVERAGE_WIDTH 70/' ./dina.bdf > ./dina-mod.bdf AVERAGE_WIDTH 80/' ./dina.bdf > ./dina-mod.bdf
# Convert the bdf to psf # Convert the bdf to psf
bdf2psf --fb ./dina-mod.bdf \ bdf2psf --fb ./dina-mod.bdf \
${pkgs.bdf2psf}/share/bdf2psf/standard.equivalents \ ${pkgs.bdf2psf}/share/bdf2psf/standard.equivalents \
${pkgs.bdf2psf}/share/bdf2psf/ascii.set+${pkgs.bdf2psf}/share/bdf2psf/linux.set+${pkgs.bdf2psf}/share/bdf2psf/useful.set \ ${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni2.512 \
512 ./dina.psf 512 ./dina.psf
''; '';
installPhase = '' installPhase = ''
install -Dm644 -t $out/share/consolefonts *.psf install -Dm644 -t $out/share/consolefonts dina.psf
''; '';
} }

View File

@ -11,22 +11,21 @@ pkgs.stdenv.mkDerivation {
owner = "NateChoe1"; owner = "NateChoe1";
repo = "ttf2psf"; repo = "ttf2psf";
rev = "8db09d05385f595c320eccae4c48ff4393ca5bde"; rev = "8db09d05385f595c320eccae4c48ff4393ca5bde";
sha256 = "A"; sha256 = "v52TZp+GyXHBAMsIoHFA8ZIMPsDVls13WW29vpesCig=";
}; };
unpackPhase = ''
true
'';
buildInputs = with pkgs; [ buildInputs = with pkgs; [
tree pkg-config
freetype
]; ];
buildPhase = '' buildPhase = ''
tree > tree.txt make build/ttf2psf
''; '';
installPhase = '' installPhase = ''
install -Dm644 -t $out/debug tree.txt install -Dm 755 -t $out/bin build/ttf2psf
install -Dm 644 -t $out/share/ttf2psf data/*.*
install -Dm 644 -t $out/share/ttf2psf/fontsets data/fontsets/*
''; '';
} }