summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-09-03 06:38:22 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-09-03 06:39:00 +0200
commit6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693 (patch)
tree2e8b8ff188863c601b65d99949c3fa7f68124b0f /nixos/modules/config
parentc59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38 (diff)
downloadnixpkgs-6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693.tar
nixpkgs-6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693.tar.gz
nixpkgs-6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693.tar.bz2
nixpkgs-6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693.tar.lz
nixpkgs-6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693.tar.xz
nixpkgs-6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693.tar.zst
nixpkgs-6dd3b54cccf8b1a4422c0cb42d0cdc2ae8593693.zip
treewide: use URN for fontconfig DTD
To match upstream change:

https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/9c46ef4aac87c42d013d0e7380b6aeb03e1a9949
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/fonts/fontconfig.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 1b6848c652e..0959e2a7a0a 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -35,7 +35,7 @@ let
     in
     pkgs.writeText "fc-00-nixos-cache.conf" ''
       <?xml version='1.0'?>
-      <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+      <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
       <fontconfig>
         <!-- Font directories -->
         ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}
@@ -53,7 +53,7 @@ let
   # priority 10
   renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" ''
     <?xml version='1.0'?>
-    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
     <fontconfig>
 
       <!-- Default rendering settings -->
@@ -110,7 +110,7 @@ let
     in
     pkgs.writeText "fc-52-nixos-default-fonts.conf" ''
     <?xml version='1.0'?>
-    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
     <fontconfig>
 
       <!-- Default fonts -->
@@ -129,7 +129,7 @@ let
   # priority 53
   rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" ''
     <?xml version="1.0"?>
-    <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+    <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
     <fontconfig>
 
     ${optionalString (!cfg.allowBitmaps) ''
@@ -157,7 +157,7 @@ let
   # priority 53
   rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
     <?xml version="1.0"?>
-    <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+    <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
     <fontconfig>
 
     <!-- Reject Type 1 fonts -->