JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

nixos/xserver: clean up the useXFS option

Browse Source 
It had confusing semantics, being somewhere between a boolean option and
a FontPath specification. Introduce fontPath to replace it and mark the
old option as removed.
This commit is contained in:
Dominik Xaver Hörl 2020-04-27 10:51:23 +02:00
parent cf115674b0
commit c3be76580f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/modules/services/x11/xserver.nix
View File

@ -113,14 +113,14 @@ let
in concatMapStrings (getAttr "value") monitors; in concatMapStrings (getAttr "value") monitors;
configFile = pkgs.runCommand "xserver.conf" configFile = pkgs.runCommand "xserver.conf"
{ xfs = optionalString (cfg.useXFS != false) { fontpath = optionalString (cfg.fontPath != null)
''FontPath "${toString cfg.useXFS}"''; ''FontPath "${cfg.fontPath}"'';
inherit (cfg) config; inherit (cfg) config;
preferLocalBuild = true; preferLocalBuild = true;
} }
'' ''
echo 'Section "Files"' >> $out echo 'Section "Files"' >> $out
echo $xfs >> $out echo $fontpath >> $out
for i in ${toString fontsForXServer}; do for i in ${toString fontsForXServer}; do
if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
@ -151,6 +151,8 @@ in
./desktop-managers/default.nix ./desktop-managers/default.nix
(mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]
"See the 16.09 release notes for more information.") "See the 16.09 release notes for more information.")
(mkRemovedOptionModule ["services" "xserver" "useXFS" ]
"Use services.xserver.fontPath instead of useXFS")
]; ];
@ -481,11 +483,15 @@ in
description = "Default colour depth."; description = "Default colour depth.";
}; };
useXFS = mkOption { fontPath = mkOption {
# FIXME: what's the type of this option? type = types.nullOr types.str;
default = false; default = null;
example = "unix/:7100"; example = "unix/:7100";
description = "Determines how to connect to the X Font Server."; description = ''
Set the X server FontPath. Defaults to null, which
means the compiled in defaults will be used. See
man xorg.conf for details.
'';
}; };
tty = mkOption { tty = mkOption {