From 9b431cb24e3de6a601d60b2598014897177f5ab0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 21:58:40 -0400
Subject: [PATCH] upower: Work around the daemon getting stuck after a suspend

---
 modules/services/hardware/upower.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 7cd5cd3ddf8..58f2610ce06 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -50,6 +50,15 @@ with pkgs.lib;
         mkdir -m 0755 -p /var/lib/upower
       '';
 
+    # The upower daemon seems to get stuck after doing a suspend
+    # (i.e. subsequent suspend requests will say "Sleep has already
+    # been requested and is pending").  So as a workaround, restart
+    # the daemon.
+    powerManagement.resumeCommands =
+      ''
+        ${config.system.build.systemd}/bin/systemctl try-restart upower
+      '';
+
   };
 
 }