diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-19 20:51:30 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-19 20:51:30 +0200 |
| commit | 36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281 (patch) | |
| tree | dbffcc3e1a259bccbeaea3504b44913239bbd105 /pkgs/os-specific/linux/upower/default.nix | |
| parent | 1a1c83fa7756313618f29c26770bdee1ae3dfb88 (diff) | |
| download | nixpkgs-36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281.tar nixpkgs-36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281.tar.gz nixpkgs-36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281.tar.bz2 nixpkgs-36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281.tar.lz nixpkgs-36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281.tar.xz nixpkgs-36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281.tar.zst nixpkgs-36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281.zip | |
upower: pull patches used in Ubuntu/trusty (fix #2884)
Diffstat (limited to 'pkgs/os-specific/linux/upower/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index e9fa2b4adb1..605d3d7adc5 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils , useSystemd ? true, systemd, gobjectIntrospection }: @@ -13,6 +13,20 @@ stdenv.mkDerivation rec { sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3"; }; + patches = [ + (fetchpatch rec { + url = "http://anonscm.debian.org/gitweb/?p=pkg-utopia/upower.git;" + + "a=blob_plain;f=debian/patches/${name};hb=b424b2763fbbba95df8c6ab3feeb57d072a9ddf7"; + sha256 = "0iq991abrn745icyz6x0wyixrjli01vbmbd9lnwwgyil58h3z8sp"; + name = "no_deprecation_define.patch"; + }) + (fetchpatch { + url = "http://cgit.freedesktop.org/upower/patch/?id=22da1a0bc5943b683189418d8b0f766e91b2bdbe"; + sha256 = "0yfgg6pw4bwskannvdwjxr75lgdrjpxhsskwlzm0frp8v5jy4k4z"; + name = "clamp-battery-percentages.patch"; + }) + ]; + buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; |