git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80326 from rnhmjoj/uni-vga

uni-vga: generate otb, psf and split output

commit0d47e820c32d64a43f86fb29dc7352b3d0547d06 authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com> dateWed 19 Feb 2020, 11:07 (7 years ago) parent5f12d64fc479ad
2 files changed+44−13
pkgs/data/fonts/uni-vga/default.nix+42−12 pkgs/top-level/all-packages.nix+2−1
pkgs/data/fonts/uni-vga/default.nix+42−12
@@ -1,4 +1,8 @@
1−{ stdenv, fetchurl, mkfontdir, mkfontscale }:
1+{ stdenv, fetchurl, perl, kbd, bdftopcf
2+, libfaketime, fonttosfnt, mkfontscale
3+}:
4+
5+with stdenv.lib;
26
37stdenv.mkDerivation {
48 name = "uni-vga";
@@ -8,24 +12,50 @@ stdenv.mkDerivation {
812 sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
913 };
1014
11− nativeBuildInputs = [ mkfontdir mkfontscale ];
15+ nativeBuildInputs =
16+ [ bdftopcf libfaketime
17+ fonttosfnt mkfontscale
18+ ] ++ optionals stdenv.isLinux [ perl kbd ];
19+
20+ postPatch = "patchShebangs .";
21+
22+ buildPhase = ''
23+ # convert font to compressed pcf
24+ bdftopcf u_vga16.bdf | gzip -c -9 -n > u_vga16.pcf.gz
25+
26+ # convert bdf font to otb
27+ faketime -f "1970-01-01 00:00:01" \
28+ fonttosfnt -v -o u_vga16.otb u_vga16.bdf
29+ '' + optionalString stdenv.isLinux ''
30+ # convert font to compressed psf
31+ ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
32+ | psfaddtable - UniCyrX.sfm - \
33+ | gzip -c -9 -n > u_vga16.psf.gz
34+ '';
1235
1336 installPhase = ''
14− mkdir -p $out/share/fonts
15− cp *.bdf $out/share/fonts
16− cd $out/share/fonts
17− mkfontdir
18− mkfontscale
37+ # install pcf (for X11 applications)
38+ install -m 644 -D *.pcf.gz -t "$out/share/fonts"
39+ mkfontdir "$out/share/fonts"
40+
41+ # install bdf font
42+ install -m 644 -D *.bdf -t "$bdf/share/fonts"
43+ mkfontdir "$bdf/share/fonts"
44+
45+ # install otb font (for GTK applications)
46+ install -m 644 -D *.otb -t "$otb/share/fonts"
47+ mkfontdir "$otb/share/fonts"
48+ '' + optionalString stdenv.isLinux ''
49+ # install psf (for linux virtual terminal)
50+ install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
1951 '';
2052
21− outputHashAlgo = "sha256";
22− outputHashMode = "recursive";
23− outputHash = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
53+ outputs = [ "out" "bdf" "otb" ];
2454
2555 meta = {
2656 description = "Unicode VGA font";
27− maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
57+ maintainers = [ maintainers.ftrvxmtrx ];
2858 homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/;
29− license = stdenv.lib.licenses.mit;
59+ license = licenses.mit;
3060 };
3161}
pkgs/top-level/all-packages.nix+2−1
@@ -18039,7 +18039,8 @@ in
1803918039
1804018040 undefined-medium = callPackage ../data/fonts/undefined-medium { };
1804118041
18042− uni-vga = callPackage ../data/fonts/uni-vga { };
18042+ uni-vga = callPackage ../data/fonts/uni-vga
18043+ { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
1804318044
1804418045 unicode-character-database = callPackage ../data/misc/unicode-character-database { };
1804518046