@@ -2,8 +2,6 @@
22, libfaketime, fonttosfnt, mkfontscale
33}:
44
5−with lib;
6−
75stdenv.mkDerivation {
86 name = "uni-vga";
97
@@ -15,7 +13,7 @@ stdenv.mkDerivation {
1513 nativeBuildInputs =
1614 [ bdftopcf libfaketime
1715 fonttosfnt mkfontscale
18− ] ++ optionals stdenv.isLinux [ perl kbd ];
16+ ] ++ lib.optionals stdenv.isLinux [ perl kbd ];
1917
2018 postPatch = "patchShebangs .";
2119
@@ -26,7 +24,7 @@ stdenv.mkDerivation {
2624 # convert bdf font to otb
2725 faketime -f "1970-01-01 00:00:01" \
2826 fonttosfnt -v -o u_vga16.otb u_vga16.bdf
29− '' + optionalString stdenv.isLinux ''
27+ '' + lib.optionalString stdenv.isLinux ''
3028 # convert font to compressed psf
3129 ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
3230 | psfaddtable - UniCyrX.sfm - \
@@ -42,14 +40,14 @@ stdenv.mkDerivation {
4240 install -m 644 -D *.bdf -t "$bdf/share/fonts"
4341 mkfontdir "$bdf/share/fonts"
4442
45− '' + optionalString stdenv.isLinux ''
43+ '' + lib.optionalString stdenv.isLinux ''
4644 # install psf (for linux virtual terminal)
4745 install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
4846 '';
4947
5048 outputs = [ "out" "bdf" ];
5149
52− meta = {
50+ meta = with lib; {
5351 description = "Unicode VGA font";
5452 maintainers = [ maintainers.ftrvxmtrx ];
5553 homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/";