From 4aec520f84649b96c54526399444c2cd1acd2da2 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Jun 2021 21:43:04 +0200 Subject: [PATCH] tv xserver: useXFS -> fontPath tv xserver: useXFS -> fontPath For nixpkgs 21.05 --- tv/2configs/xserver/xserver.conf.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tv/2configs/xserver/xserver.conf.nix b/tv/2configs/xserver/xserver.conf.nix index 6f34e0150..99038e5fc 100644 --- a/tv/2configs/xserver/xserver.conf.nix +++ b/tv/2configs/xserver/xserver.conf.nix @@ -9,15 +9,15 @@ in pkgs.stdenv.mkDerivation { name = "xserver.conf"; - xfs = optionalString (cfg.useXFS != false) - ''FontPath "${toString cfg.useXFS}"''; + fontPath = optionalString (cfg.fontPath != null) + ''FontPath "${toString cfg.fontPath}"''; inherit (cfg) config; buildCommand = '' echo 'Section "Files"' >> $out - echo $xfs >> $out + echo $fontPath >> $out for i in ${toString config.fonts.fonts}; do if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then