Merge staging-next into staging

2020-10-06 10:25:58 +02:00
parent c1a0aa7eb7 82390e2647
commit 692d219a93
646 changed files with 11286 additions and 6998 deletions
@@ -136,6 +136,7 @@ let
          fi
        done

+        echo '${cfg.filesSection}' >> $out
        echo 'EndSection' >> $out

        echo "$config" >> $out
@@ -361,6 +362,13 @@ in
        '';
      };

+      filesSection = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''FontPath "/path/to/my/fonts"'';
+        description = "Contents of the first <literal>Files</literal> section of the X server configuration file.";
+      };
+
      deviceSection = mkOption {
        type = types.lines;
        default = "";