about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-02-26 15:10:53 +0100
committerVladimír Čunát <v@cunat.cz>2020-02-26 15:10:53 +0100
commit5f881209f930b36e8b32a725586d373686c45964 (patch)
tree880994fd4e4cf58c578d4b4b931655e2e3ca0e28 /nixos
parentbee470ef9a8dc8af085e89135be94875552198f7 (diff)
downloadnixlib-5f881209f930b36e8b32a725586d373686c45964.tar
nixlib-5f881209f930b36e8b32a725586d373686c45964.tar.gz
nixlib-5f881209f930b36e8b32a725586d373686c45964.tar.bz2
nixlib-5f881209f930b36e8b32a725586d373686c45964.tar.lz
nixlib-5f881209f930b36e8b32a725586d373686c45964.tar.xz
nixlib-5f881209f930b36e8b32a725586d373686c45964.tar.zst
nixlib-5f881209f930b36e8b32a725586d373686c45964.zip
nixos/kresd: never force `extraFeatures = false`
Fixes #81109.  Regressed in PR #78392 (26858063).
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/kresd.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index a2f91a4200bf..c5a84eebd46f 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -32,9 +32,9 @@ let
     + cfg.extraConfig
   );
 
-  package = pkgs.knot-resolver.override {
-    extraFeatures = cfg.listenDoH != [];
-  };
+  package = if cfg.listenDoH == []
+    then pkgs.knot-resolver # never force `extraFeatures = false`
+    else pkgs.knot-resolver.override { extraFeatures = true; };
 in {
   meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];