upower: add 0.99 version for gnome 3.12

authored by

Luca Bruno and committed by
Luca Bruno
df95a8cc 819b5841

+73 -6
+17 -5
nixos/modules/services/hardware/upower.nix
··· 4 4 5 5 with lib; 6 6 7 + let 8 + cfg = config.services.upower; 9 + in 7 10 { 8 11 9 12 ###### interface ··· 21 24 ''; 22 25 }; 23 26 27 + package = mkOption { 28 + type = types.package; 29 + default = pkgs.upower; 30 + example = lib.literalExample "pkgs.upower"; 31 + description = '' 32 + Which upower package to use. 33 + ''; 34 + }; 35 + 24 36 }; 25 37 26 38 }; ··· 28 40 29 41 ###### implementation 30 42 31 - config = mkIf config.services.upower.enable { 43 + config = mkIf cfg.enable { 32 44 33 - environment.systemPackages = [ pkgs.upower ]; 45 + environment.systemPackages = [ cfg.package ]; 34 46 35 - services.dbus.packages = [ pkgs.upower ]; 47 + services.dbus.packages = [ cfg.package ]; 36 48 37 - services.udev.packages = [ pkgs.upower ]; 49 + services.udev.packages = [ cfg.package ]; 38 50 39 51 systemd.services.upower = 40 52 { description = "Power Management Daemon"; ··· 42 54 serviceConfig = 43 55 { Type = "dbus"; 44 56 BusName = "org.freedesktop.UPower"; 45 - ExecStart = "@${pkgs.upower}/libexec/upowerd upowerd"; 57 + ExecStart = "@${cfg.package}/libexec/upowerd upowerd"; 46 58 }; 47 59 }; 48 60
+1
nixos/modules/services/x11/desktop-managers/gnome3.nix
··· 70 70 services.telepathy.enable = mkDefault true; 71 71 networking.networkmanager.enable = true; 72 72 services.upower.enable = config.powerManagement.enable; 73 + services.upower.package = gnome3.upower; 73 74 74 75 fonts.fonts = [ pkgs.dejavu_fonts ]; 75 76
+1 -1
pkgs/desktops/gnome-3/3.10/default.nix
··· 1 1 { callPackage, self, pkgs }: 2 2 3 3 rec { 4 - inherit (pkgs) glib gtk2 gtk3 gnome2; 4 + inherit (pkgs) glib gtk2 gtk3 gnome2 upower; 5 5 gtk = gtk3; # just to be sure 6 6 libcanberra = pkgs.libcanberra_gtk3; # just to be sure 7 7 inherit (pkgs.gnome2) ORBit2;
+1
pkgs/desktops/gnome-3/3.12/default.nix
··· 3 3 rec { 4 4 inherit (pkgs) glib gtk2 gtk3 gnome2; 5 5 gnome3 = pkgs.gnome3_12; 6 + upower = pkgs.upower_99; 6 7 gtk = gtk3; # just to be sure 7 8 libcanberra = pkgs.libcanberra_gtk3; # just to be sure 8 9 inherit (pkgs.gnome2) ORBit2;
+51
pkgs/os-specific/linux/upower/0.99.nix
··· 1 + { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit 2 + , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils 3 + , useSystemd ? true, systemd, gobjectIntrospection 4 + }: 5 + 6 + assert stdenv.isLinux; 7 + 8 + stdenv.mkDerivation rec { 9 + name = "upower-0.99.0"; 10 + 11 + src = fetchurl { 12 + url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; 13 + sha256 = "189rd8j5czy4fs7imxvr38icjh9vlgdz6ki2h08v530h96clndaz"; 14 + }; 15 + 16 + buildInputs = 17 + [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] 18 + ++ stdenv.lib.optional useSystemd systemd; 19 + 20 + nativeBuildInputs = [ pkgconfig ]; 21 + 22 + preConfigure = 23 + '' 24 + substituteInPlace src/linux/up-backend.c \ 25 + --replace /usr/bin/pm- ${pmutils}/bin/pm- \ 26 + --replace /usr/sbin/pm- ${pmutils}/sbin/pm- 27 + substituteInPlace src/notify-upower.sh \ 28 + --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send 29 + ''; 30 + 31 + configureFlags = 32 + [ "--with-backend=linux" "--localstatedir=/var" 33 + "--enable-deprecated" # needed for Xfce (Nov 2013) 34 + ] 35 + ++ stdenv.lib.optional useSystemd 36 + [ "--enable-systemd" 37 + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" 38 + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" 39 + "--with-udevrulesdir=$(out)/lib/udev/rules.d" 40 + ]; 41 + 42 + NIX_CFLAGS_LINK = "-lgcc_s"; 43 + 44 + installFlags = "historydir=$(TMPDIR)/foo"; 45 + 46 + meta = { 47 + homepage = http://upower.freedesktop.org/; 48 + description = "A D-Bus service for power management"; 49 + platforms = stdenv.lib.platforms.linux; 50 + }; 51 + }
+2
pkgs/top-level/all-packages.nix
··· 7544 7544 7545 7545 upower = callPackage ../os-specific/linux/upower { }; 7546 7546 7547 + upower_99 = callPackage ../os-specific/linux/upower/0.99.nix { }; 7548 + 7547 7549 upstart = callPackage ../os-specific/linux/upstart { }; 7548 7550 7549 7551 usbutils = callPackage ../os-specific/linux/usbutils { };