Merge master into haskell-updates

1 files changed, 4 insertions, 6 deletions

diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix
index 56ba36b1eb416..fea90e8b8e760 100644
--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/pkgs/data/fonts/uni-vga/default.nix
@@ -2,8 +2,6 @@
 , libfaketime, fonttosfnt, mkfontscale
 }:
 
-with lib;
-
 stdenv.mkDerivation {
   name = "uni-vga";
 
@@ -15,7 +13,7 @@ stdenv.mkDerivation {
   nativeBuildInputs =
     [ bdftopcf libfaketime
       fonttosfnt mkfontscale
-    ] ++ optionals stdenv.isLinux [ perl kbd ];
+    ] ++ lib.optionals stdenv.isLinux [ perl kbd ];
 
   postPatch = "patchShebangs .";
 
@@ -26,7 +24,7 @@ stdenv.mkDerivation {
     # convert bdf font to otb
     faketime -f "1970-01-01 00:00:01" \
     fonttosfnt -v -o u_vga16.otb u_vga16.bdf
-  '' + optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     # convert font to compressed psf
     ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
       | psfaddtable - UniCyrX.sfm - \
@@ -42,14 +40,14 @@ stdenv.mkDerivation {
     install -m 644 -D *.bdf -t "$bdf/share/fonts"
     mkfontdir "$bdf/share/fonts"
 
-  '' + optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     # install psf (for linux virtual terminal)
     install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
   '';
 
   outputs = [ "out" "bdf" ];
 
-  meta = {
+  meta = with lib; {
     description = "Unicode VGA font";
     maintainers = [ maintainers.ftrvxmtrx ];
     homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/";