From 40d61bfe36bb83d698bc33e2b189fc85e14a2c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 29 May 2013 23:31:47 +0200
Subject: [PATCH] Revert "networkmanager: clean some attrs missing in nixpkgs
 x-updates"

This reverts commit a649bbea4e2c07b5c10ecc34fc974f8fbe3cda26.
---
 modules/services/networking/networkmanager.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 418c6d3ccdbf..b82f34aa9011 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -89,7 +89,9 @@ in {
       { source = configFile;
         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;
@@ -132,7 +134,7 @@ in {
     security.polkit.permissions = polkitConf;
 
     # openvpn plugin has only dbus interface
-    services.dbus.packages = cfg.packages;
+    services.dbus.packages = cfg.packages ++ [ networkmanager_openvpn ];
 
     services.udev.packages = cfg.packages;
   };