summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2023-11-18 21:47:51 +0200
committerGitHub <noreply@github.com>2023-11-18 21:47:51 +0200
commit8896579a831d6fd427de8e46d770c139ac2105c8 (patch)
treeb7f8ee59f8fe679393b40b1acfe958f72b4017c2 /nixos/modules
parentec8f4de5de7210586ca3ef5926e431fbf4410fdc (diff)
parent09cc3285cc6aaf641ad1f61f3100358cd7afe048 (diff)
downloadnixpkgs-8896579a831d6fd427de8e46d770c139ac2105c8.tar
nixpkgs-8896579a831d6fd427de8e46d770c139ac2105c8.tar.gz
nixpkgs-8896579a831d6fd427de8e46d770c139ac2105c8.tar.bz2
nixpkgs-8896579a831d6fd427de8e46d770c139ac2105c8.tar.lz
nixpkgs-8896579a831d6fd427de8e46d770c139ac2105c8.tar.xz
nixpkgs-8896579a831d6fd427de8e46d770c139ac2105c8.tar.zst
nixpkgs-8896579a831d6fd427de8e46d770c139ac2105c8.zip
Merge pull request #264521 from stephen-huan/mullvad-vpn-resolvconf
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/networking/mullvad-vpn.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix
index 99ffbf56ccb..8c7d5237971 100644
--- a/nixos/modules/services/networking/mullvad-vpn.nix
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@@ -65,7 +65,9 @@ with lib;
         pkgs.iproute2
         # Needed for ping
         "/run/wrappers"
-      ];
+        # See https://github.com/NixOS/nixpkgs/issues/262681
+      ] ++ (lib.optional config.networking.resolvconf.enable
+        config.networking.resolvconf.package);
       startLimitBurst = 5;
       startLimitIntervalSec = 20;
       serviceConfig = {