summary refs log tree commit diff
path: root/pkgs/data/fonts/noto-fonts/default.nix
diff options
context:
space:
mode:
authorwrvsrx <wrvsrx@outlook.com>2023-05-06 18:35:08 +0800
committerwrvsrx <wrvsrx@outlook.com>2023-05-06 18:35:08 +0800
commitb7028fd6dc038055f2edf7ea5c41c5be413ddced (patch)
tree5ff64bc1c45bc5663e951cc59e5c30b786208284 /pkgs/data/fonts/noto-fonts/default.nix
parentcf12cc9d6ab115a2c5824b7b70b5f461054570e2 (diff)
downloadnixpkgs-b7028fd6dc038055f2edf7ea5c41c5be413ddced.tar
nixpkgs-b7028fd6dc038055f2edf7ea5c41c5be413ddced.tar.gz
nixpkgs-b7028fd6dc038055f2edf7ea5c41c5be413ddced.tar.bz2
nixpkgs-b7028fd6dc038055f2edf7ea5c41c5be413ddced.tar.lz
nixpkgs-b7028fd6dc038055f2edf7ea5c41c5be413ddced.tar.xz
nixpkgs-b7028fd6dc038055f2edf7ea5c41c5be413ddced.tar.zst
nixpkgs-b7028fd6dc038055f2edf7ea5c41c5be413ddced.zip
noto-fonts-cjk: use typeface and version to generate git rev
Diffstat (limited to 'pkgs/data/fonts/noto-fonts/default.nix')
-rw-r--r--pkgs/data/fonts/noto-fonts/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 80aeabc786c..600074002f5 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -89,7 +89,7 @@ rec {
       };
     };
 
-  mkNotoCJK = { typeface, version, rev, sha256 }:
+  mkNotoCJK = { typeface, version, sha256 }:
     stdenvNoCC.mkDerivation {
       pname = "noto-fonts-cjk-${lib.toLower typeface}";
       inherit version;
@@ -97,7 +97,8 @@ rec {
       src = fetchFromGitHub {
         owner = "googlefonts";
         repo = "noto-cjk";
-        inherit rev sha256;
+        rev = "${typeface}${version}";
+        inherit sha256;
         sparseCheckout = [ "${typeface}/Variable/OTC" ];
       };
 
@@ -154,14 +155,12 @@ rec {
   noto-fonts-cjk-sans = mkNotoCJK {
     typeface = "Sans";
     version = "2.004";
-    rev = "Sans2.004";
     sha256 = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
   };
 
   noto-fonts-cjk-serif = mkNotoCJK {
     typeface = "Serif";
     version = "2.001";
-    rev = "Serif2.001";
     sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg=";
   };