From 87cc20eddbabce1572c8f10d8872a592b53a58ce Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Feb 2017 07:05:31 +0100 Subject: [PATCH] nixos/networkd: Fix eval error for defaultGateway Regression introduced by 0cb487ee044bbe5cfa1d6421df385b6bc2447bd2. This changed the result for defaultGateway to be a submodule instead of just a plain string, so instead of using just cfg.defaultGateway we need to pass cfg.defaultGateway.address now. Signed-off-by: aszlig Cc: @abbradar --- nixos/modules/tasks/network-interfaces-systemd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index a1212c905560..cd599d8b8941 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -62,9 +62,9 @@ in genericNetwork = override: { DHCP = override (dhcpStr cfg.useDHCP); } // optionalAttrs (cfg.defaultGateway != null) { - gateway = override [ cfg.defaultGateway ]; + gateway = override [ cfg.defaultGateway.address ]; } // optionalAttrs (cfg.defaultGateway6 != null) { - gateway = override [ cfg.defaultGateway6 ]; + gateway = override [ cfg.defaultGateway6.address ]; } // optionalAttrs (domains != [ ]) { domains = override domains; };