about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-27 13:51:43 +0300
committerNikolay Amiantov <ab@fmap.me>2016-04-27 13:51:43 +0300
commit7ac1ef05fa162d8e3c35925034df72288df77c8b (patch)
treefd75c19279a9df670a9a105b9b2520265a96d076
parent16bdef135089513223bf567a1ee843009eb132ca (diff)
downloadnixlib-7ac1ef05fa162d8e3c35925034df72288df77c8b.tar
nixlib-7ac1ef05fa162d8e3c35925034df72288df77c8b.tar.gz
nixlib-7ac1ef05fa162d8e3c35925034df72288df77c8b.tar.bz2
nixlib-7ac1ef05fa162d8e3c35925034df72288df77c8b.tar.lz
nixlib-7ac1ef05fa162d8e3c35925034df72288df77c8b.tar.xz
nixlib-7ac1ef05fa162d8e3c35925034df72288df77c8b.tar.zst
nixlib-7ac1ef05fa162d8e3c35925034df72288df77c8b.zip
networkmanager service: fixup
-rw-r--r--nixos/modules/services/networking/networkmanager.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d0b86b4cbdba..b83b8b91c678 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -114,7 +114,7 @@ in {
       # Ugly hack for using the correct gnome3 packageSet
       basePackages = mkOption {
         type = types.attrsOf types.package;
-        default = { inherit networkmanager.out modemmanager wpa_supplicant
+        default = { inherit networkmanager modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
                             networkmanager_openconnect
                             networkmanager_pptp networkmanager_l2tp; };
@@ -187,7 +187,7 @@ in {
 
     boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
 
-    environment.etc = with cfg.basePackages; [
+    environment.etc = with mapAttrs (name: getBin) cfg.basePackages; [
       { source = ipUpScript;
         target = "NetworkManager/dispatcher.d/01nixos-ip-up";
       }