mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
microsoft-edge: fix CJK fonts by default
This commit is contained in:
parent
d9839f0cd9
commit
cfd2e6fb9c
1 changed files with 13 additions and 0 deletions
|
|
@ -90,6 +90,11 @@
|
|||
libsecret,
|
||||
# Edge Specific
|
||||
libuuid,
|
||||
|
||||
# Fonts (See issue #463615)
|
||||
makeFontsConf,
|
||||
noto-fonts-cjk-sans,
|
||||
noto-fonts-cjk-serif,
|
||||
}:
|
||||
let
|
||||
opusWithCustomModes = libopus.override { withCustomModes = true; };
|
||||
|
|
@ -192,6 +197,13 @@ 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
|
||||
|
||||
|
|
@ -239,6 +251,7 @@ 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}}" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue