Merge pull request #80090 from crabtw/master

nixos/pppd: fix build error
2020-02-14 10:50:47 +01:00
parent 30bc29280a 0f8d1ac47d
commit 3d3392a492
1 changed files with 2 additions and 2 deletions
--- a/nixos/modules/services/networking/pppd.nix
+++ b/nixos/modules/services/networking/pppd.nix
@@ -130,7 +130,7 @@ in
    systemdConfigs = listToAttrs (map mkSystemd enabledConfigs);

  in mkIf cfg.enable {
-    environment.etc = mkMerge etcFiles;
-    systemd.services = mkMerge systemdConfigs;
+    environment.etc = etcFiles;
+    systemd.services = systemdConfigs;
  };
 }