Merge pull request #156342 from midchildan/fix/noto-cjk-src

This commit is contained in:
Sandro 2022-02-01 16:01:37 +01:00 committed by GitHub
commit 330c63f740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 2 deletions

View File

@ -355,6 +355,7 @@ in
nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
node-red = handleTest ./node-red.nix {};
nomad = handleTest ./nomad.nix {};
noto-fonts = handleTest ./noto-fonts.nix {};
novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
nsd = handleTest ./nsd.nix {};
nzbget = handleTest ./nzbget.nix {};

View File

@ -0,0 +1,44 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "noto-fonts";
meta = {
maintainers = with lib.maintainers; [ nickcao midchildan ];
};
machine = {
imports = [ ./common/x11.nix ];
environment.systemPackages = [ pkgs.gnome.gedit ];
fonts = {
enableDefaultFonts = false;
fonts = with pkgs;[
noto-fonts
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji
];
fontconfig.defaultFonts = {
serif = [ "Noto Serif" "Noto Serif CJK SC" ];
sansSerif = [ "Noto Sans" "Noto Sans CJK SC" ];
monospace = [ "Noto Sans Mono" "Noto Sans Mono CJK SC" ];
emoji = [ "Noto Color Emoji" ];
};
};
};
testScript =
# extracted from http://www.clagnut.com/blog/2380/
let testText = builtins.toFile "test.txt" ''
the quick brown fox jumps over the lazy dog
Eĥoŝanĝo ĉiuĵaŭde.
''; in
''
machine.wait_for_x()
machine.succeed("gedit ${testText} >&2 &")
machine.wait_for_window(".* - gedit")
machine.sleep(10)
machine.screenshot("screen")
'';
})

View File

@ -4,6 +4,7 @@
, fetchFromGitHub
, fetchurl
, cairo
, nixosTests
, python3
, pkg-config
, pngquant
@ -70,12 +71,15 @@ let
owner = "googlefonts";
repo = "noto-cjk";
inherit rev sha256;
sparseCheckout = "${typeface}/OTC";
};
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc
'';
passthru.tests.noto-fonts = nixosTests.noto-fonts;
meta = with lib; {
description = "Beautiful and free fonts for CJK languages";
homepage = "https://www.google.com/get/noto/help/cjk/";
@ -113,14 +117,14 @@ in
typeface = "Sans";
version = "2.004";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";
sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU=";
};
noto-fonts-cjk-serif = mkNotoCJK {
typeface = "Serif";
version = "2.000";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";
sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY=";
};
noto-fonts-emoji = let