tv xserver: useXFS -> fontPath
tv xserver: useXFS -> fontPath For nixpkgs 21.05
This commit is contained in:
parent
0e6e8b7188
commit
4aec520f84
@ -9,15 +9,15 @@ in
|
|||||||
pkgs.stdenv.mkDerivation {
|
pkgs.stdenv.mkDerivation {
|
||||||
name = "xserver.conf";
|
name = "xserver.conf";
|
||||||
|
|
||||||
xfs = optionalString (cfg.useXFS != false)
|
fontPath = optionalString (cfg.fontPath != null)
|
||||||
''FontPath "${toString cfg.useXFS}"'';
|
''FontPath "${toString cfg.fontPath}"'';
|
||||||
|
|
||||||
inherit (cfg) config;
|
inherit (cfg) config;
|
||||||
|
|
||||||
buildCommand =
|
buildCommand =
|
||||||
''
|
''
|
||||||
echo 'Section "Files"' >> $out
|
echo 'Section "Files"' >> $out
|
||||||
echo $xfs >> $out
|
echo $fontPath >> $out
|
||||||
|
|
||||||
for i in ${toString config.fonts.fonts}; do
|
for i in ${toString config.fonts.fonts}; do
|
||||||
if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
|
if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user