Fixed font

pkgs/fonts/dina-psf.nix

@@ -12,25 +12,39 @@ pkgs.stdenv.mkDerivation {
   '';
 
   buildInputs = with pkgs; [
-    dina-font.bdf
+    dina-font
+    # ttf2psf
     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 = ''
-    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
     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
     bdf2psf --fb ./dina-mod.bdf \
       ${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
   '';
 
   installPhase = ''
-    install -Dm644 -t $out/share/consolefonts *.psf
+    install -Dm644 -t $out/share/consolefonts dina.psf
   '';
 }

pkgs/fonts/ttf2psf.nix

@@ -11,22 +11,21 @@ pkgs.stdenv.mkDerivation {
     owner = "NateChoe1";
     repo = "ttf2psf";
     rev = "8db09d05385f595c320eccae4c48ff4393ca5bde";
-    sha256 = "A";
+    sha256 = "v52TZp+GyXHBAMsIoHFA8ZIMPsDVls13WW29vpesCig=";
   };
 
-  unpackPhase = ''
-    true
-  '';
-
   buildInputs = with pkgs; [
-    tree
+    pkg-config
+    freetype
   ];
 
   buildPhase = ''
-    tree > tree.txt
+    make build/ttf2psf
   '';
 
   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/*
   '';
 }