ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

nixos/networkd: Fix eval error for defaultGateway

Browse Source 
Regression introduced by 0cb487ee04.

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 <aszlig@redmoonstudios.org>
Cc: @abbradar
This commit is contained in:
aszlig 2017-02-07 07:05:31 +01:00
parent 9611a60708
commit 87cc20eddb
No known key found for this signature in database
GPG Key ID: 1DE8E48E57DB5436
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/tasks/network-interfaces-systemd.nix
View File

@ -62,9 +62,9 @@ in
genericNetwork = override: { genericNetwork = override: {
DHCP = override (dhcpStr cfg.useDHCP); DHCP = override (dhcpStr cfg.useDHCP);
} // optionalAttrs (cfg.defaultGateway != null) { } // optionalAttrs (cfg.defaultGateway != null) {
gateway = override [ cfg.defaultGateway ]; gateway = override [ cfg.defaultGateway.address ];
} // optionalAttrs (cfg.defaultGateway6 != null) { } // optionalAttrs (cfg.defaultGateway6 != null) {
gateway = override [ cfg.defaultGateway6 ]; gateway = override [ cfg.defaultGateway6.address ];
} // optionalAttrs (domains != [ ]) { } // optionalAttrs (domains != [ ]) {
domains = override domains; domains = override domains;
}; };