diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 10bfbf9ad301..fd740bccfb22 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13858,6 +13858,13 @@ githubId = 139; name = "Leah Neukirchen"; }; + leana8959 = { + name = "Léana Chiang"; + email = "leana.jiang+git@icloud.com"; + github = "leana8959"; + githubId = 87855546; + keys = [ { fingerprint = "3659 D5C8 7A4B C5D7 699B 37D8 4E88 7A4C A971 4ADA"; } ]; + }; lebastr = { email = "lebastr@gmail.com"; github = "lebastr"; 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 967a761e1d40..4cac82c83563 100644 --- a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix +++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, nixosTests, gitUpdater, + static ? false, # whether to build the static version of the font }: stdenvNoCC.mkDerivation rec { @@ -14,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; @@ -48,6 +56,7 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ mathnerd314 emily + leana8959 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9ec8147bcf5..b07d1ab9e4f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11721,6 +11721,10 @@ with pkgs; nordic = libsForQt5.callPackage ../data/themes/nordic { }; + 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 = [