diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2014-05-19 13:13:32 +0200 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-05-20 13:41:39 +0200 |
| commit | df95a8cc2f922e41aab51d94e3faacc83ed0e80a (patch) | |
| tree | 9362d7fbd3d1a9a70c5369fa7b355f02e5461f7a /nixos/modules/services | |
| parent | 819b5841c6586662416df895502040d64377331f (diff) | |
| download | nixlib-df95a8cc2f922e41aab51d94e3faacc83ed0e80a.tar nixlib-df95a8cc2f922e41aab51d94e3faacc83ed0e80a.tar.gz nixlib-df95a8cc2f922e41aab51d94e3faacc83ed0e80a.tar.bz2 nixlib-df95a8cc2f922e41aab51d94e3faacc83ed0e80a.tar.lz nixlib-df95a8cc2f922e41aab51d94e3faacc83ed0e80a.tar.xz nixlib-df95a8cc2f922e41aab51d94e3faacc83ed0e80a.tar.zst nixlib-df95a8cc2f922e41aab51d94e3faacc83ed0e80a.zip | |
upower: add 0.99 version for gnome 3.12
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/hardware/upower.nix | 22 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 |
2 files changed, 18 insertions, 5 deletions
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index a202d82f646a..0b6a101efa0b 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -4,6 +4,9 @@ with lib; +let + cfg = config.services.upower; +in { ###### interface @@ -21,6 +24,15 @@ with lib; ''; }; + package = mkOption { + type = types.package; + default = pkgs.upower; + example = lib.literalExample "pkgs.upower"; + description = '' + Which upower package to use. + ''; + }; + }; }; @@ -28,13 +40,13 @@ with lib; ###### implementation - config = mkIf config.services.upower.enable { + config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.upower ]; + environment.systemPackages = [ cfg.package ]; - services.dbus.packages = [ pkgs.upower ]; + services.dbus.packages = [ cfg.package ]; - services.udev.packages = [ pkgs.upower ]; + services.udev.packages = [ cfg.package ]; systemd.services.upower = { description = "Power Management Daemon"; @@ -42,7 +54,7 @@ with lib; serviceConfig = { Type = "dbus"; BusName = "org.freedesktop.UPower"; - ExecStart = "@${pkgs.upower}/libexec/upowerd upowerd"; + ExecStart = "@${cfg.package}/libexec/upowerd upowerd"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 63f39ec0d3af..4398a97ff47d 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -70,6 +70,7 @@ in { services.telepathy.enable = mkDefault true; networking.networkmanager.enable = true; services.upower.enable = config.powerManagement.enable; + services.upower.package = gnome3.upower; fonts.fonts = [ pkgs.dejavu_fonts ]; |