From d933f55e45fa1afe973117c9b8b7a5be588ec212 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Sep 2009 10:32:57 +0000
Subject: [PATCH] * Tell PolicyKit about the policies of HAL and ConsoleKit.

svn path=/nixos/trunk/; revision=17439
---
 modules/security/policykit.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
index e8cdecd0e9a..6d7b507d033 100644
--- a/modules/security/policykit.nix
+++ b/modules/security/policykit.nix
@@ -38,11 +38,19 @@ in
         gid = config.ids.gids.polkituser;
       };
 
-    environment.etc = singleton
-      { source = conf;
-        target = "PolicyKit/PolicyKit.conf";
-      };
-
+    environment.etc =
+      [ { source = conf;
+          target = "PolicyKit/PolicyKit.conf";
+        }
+        { source = (pkgs.buildEnv {
+            name = "PolicyKit-policies";
+            pathsToLink = [ "/share/PolicyKit/policy" ];
+            paths = [ pkgs.policykit pkgs.consolekit pkgs.hal ];
+          }) + "/share/PolicyKit/policy";
+          target = "PolicyKit/policy";
+        }
+      ];
+      
     system.activationScripts.policyKit = fullDepEntry
       ''
         mkdir -m 0770 -p /var/run/PolicyKit