summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-04-03 08:23:32 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-04-03 08:23:32 -0500
commit21c9190a5fd8387c90feff08198c47894c0a541d (patch)
tree95e06bc00d0fc9a8e417d62b98fdd5eadb380291
parent7a78892c478be77fd53a9fdec25a4dac043e9560 (diff)
downloadnixpkgs-21c9190a5fd8387c90feff08198c47894c0a541d.tar
nixpkgs-21c9190a5fd8387c90feff08198c47894c0a541d.tar.gz
nixpkgs-21c9190a5fd8387c90feff08198c47894c0a541d.tar.bz2
nixpkgs-21c9190a5fd8387c90feff08198c47894c0a541d.tar.lz
nixpkgs-21c9190a5fd8387c90feff08198c47894c0a541d.tar.xz
nixpkgs-21c9190a5fd8387c90feff08198c47894c0a541d.tar.zst
nixpkgs-21c9190a5fd8387c90feff08198c47894c0a541d.zip
nixos/fontconfig: remove forceAutohint option
-rw-r--r--nixos/modules/config/fonts/fontconfig.nix16
-rw-r--r--nixos/modules/rename.nix1
2 files changed, 1 insertions, 16 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 93c5f2df725..affb46c2ca0 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -104,13 +104,6 @@ let cfg = config.fonts.fontconfig;
         </match>
         ''}
 
-        <!-- Force autohint always -->
-        <match target="font">
-          <edit name="force_autohint" mode="assign">
-            ${fcBool cfg.forceAutohint}
-          </edit>
-        </match>
-
       </fontconfig>
     '';
 
@@ -453,15 +446,6 @@ in
           description = ''Use embedded bitmaps in fonts like Calibri.'';
         };
 
-        forceAutohint = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Force use of the TrueType Autohinter. Useful for debugging or
-            free-software purists.
-          '';
-        };
-
         renderMonoTTFAsBitmap = mkOption {
           type = types.bool;
           default = false;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 54433e20597..4cf48e1e2cb 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -202,5 +202,6 @@ with lib;
     (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
+    (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
   ];
 }