Merge master into haskell-updates

2022-01-23 00:08:43 +00:00
parent b2f63fbd6f e5f7e0e551
commit 45ac516cdf
109 changed files with 1953 additions and 1901 deletions
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -73,7 +73,7 @@ let
      };

      installPhase = ''
-        install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc
+        install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc
      '';

      meta = with lib; {