feat(pkgs/noto-fonts-cjk): improve it

wrvsrx · May 6, 2024 · e48175e · e48175e
1 parent db02bda
commit e48175e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 39 deletions.
diff --git a/pkgs/to-normal-packages/default.nix b/pkgs/to-normal-packages/default.nix
@@ -3,19 +3,13 @@ let
   inherit (pkgs) callPackage;
   sources = to-sources { inherit pkgs; };
   callIFD = import ../callIFD.nix;
+  mkNotoCJK = callPackage ./noto-fonts-cjk { };
 in
 rec {
   auth-thu = callPackage ./auth-thu { source = sources.auth-thu; };
   autodiff = callPackage ./autodiff { source = sources.autodiff; };
-  inherit
-    (callPackage ./noto-fonts-cjk {
-      sources = {
-        inherit (sources) noto-fonts-cjk-sans-fix-weight noto-fonts-cjk-serif-fix-weight;
-      };
-    })
-    noto-fonts-cjk-sans-fix-weight
-    noto-fonts-cjk-serif-fix-weight
-    ;
+  noto-fonts-cjk-sans-fix-weight = mkNotoCJK { source = sources.noto-fonts-cjk-sans-fix-weight; };
+  noto-fonts-cjk-serif-fix-weight = mkNotoCJK { source = sources.noto-fonts-cjk-serif-fix-weight; };
   noto-fonts-emoji-monochrome = callPackage ./noto-fonts-emoji-monochrome {
     source = sources.noto-fonts-emoji-monochrome;
   };

diff --git a/pkgs/to-normal-packages/noto-fonts-cjk/default.nix b/pkgs/to-normal-packages/noto-fonts-cjk/default.nix
@@ -1,29 +1,20 @@
 {
-  stdenv,
   stdenvNoCC,
   lib,
-  fetchFromGitHub,
-  fetchurl,
-  cairo,
   nixosTests,
-  pkg-config,
-  pngquant,
-  which,
-  imagemagick,
-  zopfli,
-  buildPackages,
-  sources,
 }:
 let
   mkNotoCJK =
-    {
-      typeface,
-      version,
-      src,
-    }:
+    { source }:
+    let
+      ver = source.version;
+      typeface = builtins.substring 0 (builtins.stringLength ver - 5) ver;
+      version = builtins.substring (builtins.stringLength ver - 5) 5 ver;
+    in
     stdenvNoCC.mkDerivation {
       pname = "noto-fonts-cjk-${lib.toLower typeface}";
-      inherit version src;
+      inherit version;
+      inherit (source) src;
 
       installPhase = ''
         install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc
@@ -55,16 +46,4 @@ let
       };
     };
 in
-{
-  noto-fonts-cjk-sans-fix-weight = mkNotoCJK {
-    typeface = "Sans";
-    version = "2.004";
-    inherit (sources.noto-fonts-cjk-sans-fix-weight) src;
-  };
-
-  noto-fonts-cjk-serif-fix-weight = mkNotoCJK {
-    typeface = "Serif";
-    version = "2.001";
-    inherit (sources.noto-fonts-cjk-serif-fix-weight) src;
-  };
-}
+mkNotoCJK