public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "networkmanager: clean some attrs missing in nixpkgs x-updates"

Browse Source 
This reverts commit a649bbea4e2c07b5c10ecc34fc974f8fbe3cda26.
This commit is contained in:
Vladimír Čunát 2013-05-29 23:31:47 +02:00
parent a13d1c3363
commit 40d61bfe36
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/services/networking/networkmanager.nix
View File

@ -89,7 +89,9 @@ in {
{ source = configFile; { source = configFile;
target = "NetworkManager/NetworkManager.conf"; target = "NetworkManager/NetworkManager.conf";
} }
##### Just temporary change, old nixpkgs base { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
target = "NetworkManager/VPN/nm-openvpn-service.name";
}
]; ];
environment.systemPackages = cfg.packages; environment.systemPackages = cfg.packages;
@ -132,7 +134,7 @@ in {
security.polkit.permissions = polkitConf; security.polkit.permissions = polkitConf;
# openvpn plugin has only dbus interface # openvpn plugin has only dbus interface
services.dbus.packages = cfg.packages; services.dbus.packages = cfg.packages ++ [ networkmanager_openvpn ];
services.udev.packages = cfg.packages; services.udev.packages = cfg.packages;
}; };