diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-21 08:34:04 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-21 08:42:44 -0400 |
commit | ab3788b3824fc9c60536978b54eb1145ba68f494 (patch) | |
tree | 9b6f353321e9f04515340d17ac745b211e314f3b /pkgs/os-specific/linux/upower | |
parent | 6121046a1c5dbea7703521f9dc816abf47eab943 (diff) | |
download | nixpkgs-ab3788b3824fc9c60536978b54eb1145ba68f494.tar nixpkgs-ab3788b3824fc9c60536978b54eb1145ba68f494.tar.gz nixpkgs-ab3788b3824fc9c60536978b54eb1145ba68f494.tar.bz2 nixpkgs-ab3788b3824fc9c60536978b54eb1145ba68f494.tar.lz nixpkgs-ab3788b3824fc9c60536978b54eb1145ba68f494.tar.xz nixpkgs-ab3788b3824fc9c60536978b54eb1145ba68f494.tar.zst nixpkgs-ab3788b3824fc9c60536978b54eb1145ba68f494.zip |
upower: Update to 0.9.18 and enable systemd support
Diffstat (limited to 'pkgs/os-specific/linux/upower')
-rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 71a05486b48..2f870e5d999 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, polkit -, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit +, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils +, useSystemd ? false, systemd ? null +}: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.17"; + name = "upower-0.9.18"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0a1j2pg44r6ljj9jgzlw8i5fzabpm2b2jk058kxsr77ciz96i7yg"; + sha256 = "13q6cw2d45qp077g3bjng4yhrvm6g1y9347dkf53kscm5xfm18d1"; }; - buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; + buildInputs = + [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ] + ++ stdenv.lib.optional useSystemd systemd; buildNativeInputs = [ pkgconfig ]; - configureFlags = "--with-backend=linux --localstatedir=/var"; + configureFlags = + [ "--with-backend=linux" "--localstatedir=/var" ] + ++ stdenv.lib.optional useSystemd + [ "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + ]; preConfigure = '' substituteInPlace src/linux/up-backend.c \ --replace /usr/bin/pm- ${pmutils}/bin/pm- \ --replace /usr/sbin/pm- ${pmutils}/sbin/pm- + substituteInPlace src/notify-upower.sh \ + --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; installFlags = "historydir=$(TMPDIR)/foo"; |