about summary refs log tree commit diff
path: root/pkgs/data/fonts/noto-fonts
diff options
context:
space:
mode:
authormidchildan <git@midchildan.org>2022-04-01 02:02:39 +0900
committermidchildan <git@midchildan.org>2022-04-01 02:20:21 +0900
commit32c0743a2016cbb30133949cd4ca384a28dee721 (patch)
tree67bf7aaf4b669c486b39cf39c3c18dd70ed7b458 /pkgs/data/fonts/noto-fonts
parent3344cea254129714919142494ec3e9e75aa09891 (diff)
noto-fonts-cjk: switch back to variable font
Fixes #156131.

This reverts commit 88ef0666443aea0f9088a18056f923240fd1424f.
Diffstat (limited to 'pkgs/data/fonts/noto-fonts')
-rw-r--r--pkgs/data/fonts/noto-fonts/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 248d076b997a2..4d91bf8905d55 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -71,11 +71,11 @@ let
         owner = "googlefonts";
         repo = "noto-cjk";
         inherit rev sha256;
-        sparseCheckout = "${typeface}/OTC";
+        sparseCheckout = "${typeface}/Variable/OTC";
       };
 
       installPhase = ''
-        install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc
+        install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc
       '';
 
       passthru.tests.noto-fonts = nixosTests.noto-fonts;
@@ -117,14 +117,14 @@ in
     typeface = "Sans";
     version = "2.004";
     rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
-    sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU=";
+    sha256 = "sha256-11d/78i21yuzxrfB5t2VQN9OBz/qZKeozuS6BrLFjzw=";
   };
 
   noto-fonts-cjk-serif = mkNotoCJK {
     typeface = "Serif";
     version = "2.000";
     rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
-    sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY=";
+    sha256 = "sha256-G+yl3LZvSFpbEUuuvattPDctKTzBCshOi970DcbPliE=";
   };
 
   noto-fonts-emoji = let