diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-04-10 17:02:57 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-04-25 12:02:33 +0200 |
| commit | db3b86560f11437e260ae6d6661c69fb5bb36c75 (patch) | |
| tree | 7d21ce8f78907ea1e6ac97b9283ea13da9d7fc05 /nixos/modules/services/networking | |
| parent | 38d6aec3f630b4ef012f902482ef0ad5a5170844 (diff) | |
| download | nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.gz nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.bz2 nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.lz nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.xz nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.tar.zst nixlib-db3b86560f11437e260ae6d6661c69fb5bb36c75.zip | |
GNOME 3.16.1, closes #7357
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f00c5d1f701d..60f380f024ba 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -98,13 +98,23 @@ in { ''; }; + # Ugly hack for using the correct gnome3 packageSet + basePackages = mkOption { + type = types.attrsOf types.path; + default = { inherit networkmanager modemmanager wpa_supplicant + networkmanager_openvpn networkmanager_vpnc + networkmanager_openconnect + networkmanager_pptp networkmanager_l2tp; }; + internal = true; + }; + packages = mkOption { type = types.listOf types.path; default = [ ]; description = '' Extra packages that provide NetworkManager plugins. ''; - apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list; + apply = list: (attrValues cfg.basePackages) ++ list; }; appendNameservers = mkOption { @@ -164,7 +174,7 @@ in { boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. - environment.etc = [ + environment.etc = with cfg.basePackages; [ { source = ipUpScript; target = "NetworkManager/dispatcher.d/01nixos-ip-up"; } @@ -195,14 +205,7 @@ in { target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; }) cfg.dispatcherScripts; - environment.systemPackages = cfg.packages ++ [ - networkmanager_openvpn - networkmanager_vpnc - networkmanager_openconnect - networkmanager_pptp - networkmanager_l2tp - modemmanager - ]; + environment.systemPackages = cfg.packages; users.extraGroups = singleton { name = "networkmanager"; @@ -238,15 +241,7 @@ in { security.polkit.extraConfig = polkitConf; - # openvpn plugin has only dbus interface - services.dbus.packages = cfg.packages ++ [ - networkmanager_openvpn - networkmanager_vpnc - networkmanager_openconnect - networkmanager_pptp - networkmanager_l2tp - modemmanager - ]; + services.dbus.packages = cfg.packages; services.udev.packages = cfg.packages; }; |