From c2da812bd0148d9a2055e93fa74911e05caf7f83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Aug 2012 11:29:59 -0400
Subject: [PATCH] Enable upower's systemd unit

---
 modules/misc/nixpkgs.nix             | 2 ++
 modules/services/hardware/upower.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 069bf8ecd9c..c8ca959d91a 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -78,6 +78,8 @@ in
       #udev = pkgs.systemd;
       slim = pkgs.slim.override { consolekit = null; };
       lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; };
+      upower = pkgs.upower.override { useSystemd = true; };
+      polkit = pkgs.polkit.override { useSystemd = true; };
     };
 
   };
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 1fdaee202d3..d025276ea8e 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -35,6 +35,8 @@ with pkgs.lib;
 
     services.udev.packages = [ pkgs.upower ];
 
+    boot.systemd.packages = [ pkgs.upower ];
+
     system.activationScripts.upower =
       ''
         mkdir -m 0755 -p /var/lib/upower