diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-02-01 16:18:48 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-02-01 16:18:48 -0600 |
| commit | 0fee7a2b214ad80823df547861814bbdc6edab80 (patch) | |
| tree | d1053236ad5ec12c409b8719c1a0edcaac231f10 /nixos | |
| parent | 9b29267511dcca53c22e68fd7b085bb98537512e (diff) | |
| download | nixpkgs-0fee7a2b214ad80823df547861814bbdc6edab80.tar nixpkgs-0fee7a2b214ad80823df547861814bbdc6edab80.tar.gz nixpkgs-0fee7a2b214ad80823df547861814bbdc6edab80.tar.bz2 nixpkgs-0fee7a2b214ad80823df547861814bbdc6edab80.tar.lz nixpkgs-0fee7a2b214ad80823df547861814bbdc6edab80.tar.xz nixpkgs-0fee7a2b214ad80823df547861814bbdc6edab80.tar.zst nixpkgs-0fee7a2b214ad80823df547861814bbdc6edab80.zip | |
fontconfig: stringify dpi correctly
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 793b0a250ac..6f17bd396a0 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -204,7 +204,7 @@ with lib; ${optionalString (fontconfig.dpi != 0) '' <match target="pattern"> <edit name="dpi" mode="assign"> - <double>${fontconfig.dpi}</double> + <double>${toString fontconfig.dpi}</double> </edit> </match> ''} diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index a1b5daa3336..601971d27b6 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -25,7 +25,7 @@ let fontconfig = config.fonts.fontconfig; 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.rgba: ${fontconfig.subpixel.rgba} Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter} |