diff --git a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix index 8fbc05ff269ce3..3d5b56ebec7423 100644 --- a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix +++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , nixosTests , gitUpdater + +, static ? false, # whether to build the static version of the font }: stdenvNoCC.mkDerivation rec { @@ -13,13 +15,20 @@ stdenvNoCC.mkDerivation rec { owner = "notofonts"; repo = "noto-cjk"; rev = "Serif${version}"; - hash = "sha256-E+Ic7XhomI6cUa+q77gQvMlaLvy+vgTq4NJ58/nPZtk="; - sparseCheckout = [ "Serif/Variable/OTC" ]; + hash = "sha256-Bwuu64TAnOnqUgLlBsUw/jnv9emngqFBmVn6zEqySlc="; + sparseCheckout = [ + "Serif/OTC" + "Serif/Variable/OTC" + ]; }; - installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc - ''; + installPhase = + let + font-path = if static then "Serif/OTC/*.ttc" else "Serif/Variable/OTC/*.otf.ttc"; + in + '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${font-path} + ''; passthru.tests.noto-fonts = nixosTests.noto-fonts; @@ -44,6 +53,6 @@ stdenvNoCC.mkDerivation rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 emily ]; + maintainers = with maintainers; [ mathnerd314 emily leana8959 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfcbc..a9e51bf97796ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27354,6 +27354,8 @@ with pkgs; nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { }; + noto-fonts-cjk-serif-static = callPackage ../by-name/no/noto-fonts-cjk-serif/package.nix { static = true; }; + noto-fonts-lgc-plus = callPackage ../by-name/no/noto-fonts/package.nix { suffix = "-lgc-plus"; variants = [