From 27cae711e77c6cae384bd83100ff297d82466154 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Tue, 19 May 2026 01:04:54 +0300 Subject: [PATCH 1/3] nixos/fonts: add Noto CJK to default fonts --- nixos/modules/config/fonts/packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/config/fonts/packages.nix b/nixos/modules/config/fonts/packages.nix index 0e4bf4a886a1..aca8a1af3ffc 100644 --- a/nixos/modules/config/fonts/packages.nix +++ b/nixos/modules/config/fonts/packages.nix @@ -47,6 +47,8 @@ in gyre-fonts # TrueType substitutes for standard PostScript fonts liberation_ttf unifont + noto-fonts-cjk-sans + noto-fonts-cjk-serif noto-fonts-color-emoji ] ); From fd765cb11e5483f38db03e69324eb13473c4bad2 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 22 May 2026 17:54:26 +0300 Subject: [PATCH 2/3] Revert "google-chrome: fix CJK fonts by default" This reverts commit 97c3e85a82e1a3507d2b579d2dc479983603c8b7. --- pkgs/by-name/go/google-chrome/package.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 6b446a00ec00..dd3937ec6789 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -79,11 +79,6 @@ bzip2, libcap, - # Fonts (See issue #463615) - makeFontsConf, - noto-fonts-cjk-sans, - noto-fonts-cjk-serif, - # Necessary for USB audio devices. libpulseaudio, pulseSupport ? true, @@ -220,13 +215,6 @@ let rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; binpath = lib.makeBinPath deps; - fontsConf = makeFontsConf { - fontDirectories = [ - noto-fonts-cjk-sans - noto-fonts-cjk-serif - ]; - }; - installPhase = '' runHook preInstall @@ -278,7 +266,6 @@ let --prefix PATH : "$binpath" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ - --set FONTCONFIG_FILE "${finalAttrs.fontsConf}" \ --set CHROME_WRAPPER "google-chrome-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ From d1bb20ce9a557e881559400faf02bed8094d4753 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 22 May 2026 17:55:18 +0300 Subject: [PATCH 3/3] Revert "microsoft-edge: fix CJK fonts by default" This reverts commit cfd2e6fb9cc52b384ed7c7d4bbd367387b547d7b. --- pkgs/by-name/mi/microsoft-edge/package.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index f396929480ef..1410cf1c7298 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -90,12 +90,6 @@ libsecret, # Edge Specific libuuid, - - # Fonts (See issue #463615) - makeFontsConf, - noto-fonts-cjk-sans, - noto-fonts-cjk-serif, - # Create a symlink at $out/bin/microsoft-edge-stable withSymlink ? true, }: @@ -200,13 +194,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; binpath = lib.makeBinPath deps; - fontsConf = makeFontsConf { - fontDirectories = [ - noto-fonts-cjk-sans - noto-fonts-cjk-serif - ]; - }; - installPhase = '' runHook preInstall @@ -254,7 +241,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --prefix PATH : "$binpath" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ - --set FONTCONFIG_FILE "${finalAttrs.fontsConf}" \ --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \ --set CHROME_WRAPPER "microsoft-edge-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \