From 38229da94069b42d1cc95ab715f6046d9fbcbe07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 16:38:31 -0400
Subject: [PATCH] upower: Add glib to $PATH

The upower daemon needs the gdbus command (which is weird given that
upower links against dbus_glib, but ah well...).  This fixes suspend
in KDE with systemd.
---
 modules/services/hardware/upower.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index d025276ea8e..7cd5cd3ddf8 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -35,7 +35,15 @@ with pkgs.lib;
 
     services.udev.packages = [ pkgs.upower ];
 
-    boot.systemd.packages = [ pkgs.upower ];
+    boot.systemd.services.upower =
+      { description = "Power Management Daemon";
+        path = [ pkgs.glib ]; # needed for gdbus
+        serviceConfig =
+          { Type = "dbus";
+            BusName = "org.freedesktop.UPower";
+            ExecStart = "@${pkgs.upower}/libexec/upowerd upowerd";
+          };
+      };
 
     system.activationScripts.upower =
       ''