diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-06-05 10:42:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-06-05 10:42:33 +0200 |
| commit | f5bb8b9125a110016048056d09b5072aa12a81fb (patch) | |
| tree | 5167a3dbda7790be8633a026468caa17e4a38341 | |
| parent | Merge #175568: python310Packages.pyramid_jinja2: disable failing tests (diff) | |
| parent | noto-fonts-cjk: Revert "switch back to variable font" (diff) | |
| download | nixpkgs-f5bb8b9125a110016048056d09b5072aa12a81fb.tar.gz | |
Merge #174753: Revert "noto-fonts-cjk: switch back to variable font"
...into release-22.05
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 8 |
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 4d91bf8905d5..248d076b997a 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}/Variable/OTC"; + sparseCheckout = "${typeface}/OTC"; }; 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 ''; passthru.tests.noto-fonts = nixosTests.noto-fonts; @@ -117,14 +117,14 @@ in typeface = "Sans"; version = "2.004"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-11d/78i21yuzxrfB5t2VQN9OBz/qZKeozuS6BrLFjzw="; + sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU="; }; noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; version = "2.000"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-G+yl3LZvSFpbEUuuvattPDctKTzBCshOi970DcbPliE="; + sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY="; }; noto-fonts-emoji = let |