summary refs log tree commit diff
diff options
context:
space:
mode:
authorJyun-Yan You <jyyou.tw@gmail.com>2020-02-14 10:42:49 +0800
committerJyun-Yan You <jyyou.tw@gmail.com>2020-02-14 12:51:50 +0800
commit0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec (patch)
tree98af242690634cd93927d60aaafe2825c257ec63
parentc1741fc12a3329cf4c4509f22c60dfd4d54a192f (diff)
downloadnixpkgs-0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec.tar
nixpkgs-0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec.tar.gz
nixpkgs-0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec.tar.bz2
nixpkgs-0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec.tar.lz
nixpkgs-0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec.tar.xz
nixpkgs-0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec.tar.zst
nixpkgs-0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec.zip
nixos/pppd: fix build error
-rw-r--r--nixos/modules/services/networking/pppd.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix
index b31bfa64235..c1cbdb46176 100644
--- 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;
   };
 }