summary refs log tree commit diff
path: root/nixos/modules/services/hardware
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2014-11-08 15:56:32 +0100
committerLuca Bruno <lucabru@src.gnome.org>2014-11-08 15:56:40 +0100
commit83221f3886c8b74f78edbad5a1541de0837a0f24 (patch)
treef9a53d659e562acf0637ffb42f013aebf460a947 /nixos/modules/services/hardware
parent7f3c95e6b7d40df043652b2fca54b0997e7a1937 (diff)
parentaa2fd47e9dee4e36e4bd494601e0ae5d9b40a78f (diff)
downloadnixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar
nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.gz
nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.bz2
nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.lz
nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.xz
nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.zst
nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.zip
Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
Diffstat (limited to 'nixos/modules/services/hardware')
-rw-r--r--nixos/modules/services/hardware/thermald.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix
index 5233794a20cc..88c3f99aed4e 100644
--- a/nixos/modules/services/hardware/thermald.nix
+++ b/nixos/modules/services/hardware/thermald.nix
@@ -19,6 +19,8 @@ in {
 
   ###### implementation
   config = mkIf cfg.enable {
+    services.dbus.packages = [ pkgs.thermald ];
+
     systemd.services.thermald = {
       description = "Thermal Daemon Service";
       wantedBy = [ "multi-user.target" ];