nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-30 16:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fontconfig: stringify dpi correctly

Browse Source
This commit is contained in:
Thomas Tuegel 2015-02-01 16:18:48 -06:00
parent 9b29267511
commit 0fee7a2b21
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/fonts/fontconfig.nix
View File

@ -204,7 +204,7 @@ with lib;
${optionalString (fontconfig.dpi != 0) '' ${optionalString (fontconfig.dpi != 0) ''
<match target="pattern"> <match target="pattern">
<edit name="dpi" mode="assign"> <edit name="dpi" mode="assign">
<double>${fontconfig.dpi}</double> <double>${toString fontconfig.dpi}</double>
</edit> </edit>
</match> </match>
''} ''}

2
nixos/modules/services/x11/display-managers/default.nix
View File

@ -25,7 +25,7 @@ let
fontconfig = config.fonts.fontconfig; fontconfig = config.fonts.fontconfig;
xresourcesXft = pkgs.writeText "Xresources-Xft" '' xresourcesXft = pkgs.writeText "Xresources-Xft" ''
${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${fontconfig.dpi}''} ${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${toString fontconfig.dpi}''}
Xft.antialias: ${if fontconfig.antialias then "1" else "0"} Xft.antialias: ${if fontconfig.antialias then "1" else "0"}
Xft.rgba: ${fontconfig.subpixel.rgba} Xft.rgba: ${fontconfig.subpixel.rgba}
Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter} Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter}