diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-05-09 16:10:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-09 16:10:28 -0400 |
commit | 974cbe2acca4184cf09fd2b03b71eb4fcde8bff1 (patch) | |
tree | c9c49103ed9bd1703e805de6e3e0346a69323e82 | |
parent | cf52ec2c7052feb34711243e90795ea7dcb90e21 (diff) | |
parent | b39324bf5253b55d1137cd3821fad4e445919c4c (diff) | |
download | nixlib-974cbe2acca4184cf09fd2b03b71eb4fcde8bff1.tar nixlib-974cbe2acca4184cf09fd2b03b71eb4fcde8bff1.tar.gz nixlib-974cbe2acca4184cf09fd2b03b71eb4fcde8bff1.tar.bz2 nixlib-974cbe2acca4184cf09fd2b03b71eb4fcde8bff1.tar.lz nixlib-974cbe2acca4184cf09fd2b03b71eb4fcde8bff1.tar.xz nixlib-974cbe2acca4184cf09fd2b03b71eb4fcde8bff1.tar.zst nixlib-974cbe2acca4184cf09fd2b03b71eb4fcde8bff1.zip |
Merge pull request #61174 from worldofpeace/bump-upower
upower: 0.99.9 -> 0.99.10
-rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 71 |
1 files changed, 47 insertions, 24 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 0aaa31163ac5..14458356a790 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,41 +1,64 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib -, intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 -, useSystemd ? true, systemd, gobject-introspection +{ stdenv +, fetchurl +, pkgconfig +, dbus-glib +, intltool +, libxslt +, docbook_xsl +, udev +, libgudev +, libusb1 +, gobject-introspection +, useSystemd ? true, systemd }: stdenv.mkDerivation rec { - name = "upower-0.99.9"; + pname = "upower"; + version = "0.99.10"; src = fetchurl { - url = https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz; - sha256 = "046ix7j7hmb7ycv8v54668kjsrgjhzwxn299c1d87vdnkd38kfh1"; + url = https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz; + sha256 = "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4"; }; - buildInputs = - [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobject-introspection ] - ++ stdenv.lib.optional useSystemd systemd; + nativeBuildInputs = [ + pkgconfig + ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + dbus-glib + intltool + libxslt + docbook_xsl + udev + libgudev + libusb1 + gobject-introspection + ] + ++ stdenv.lib.optional useSystemd systemd + ; - configureFlags = - [ "--with-backend=linux" "--localstatedir=/var" - ] - ++ stdenv.lib.optional useSystemd - [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemdutildir=$(out)/lib/systemd" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - ]; - - NIX_CFLAGS_LINK = "-lgcc_s"; + configureFlags = [ + "--with-backend=linux" + "--localstatedir=/var" + ] + ++ stdenv.lib.optional useSystemd [ + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "--with-systemdutildir=${placeholder ''out''}/lib/systemd" + "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" + ] + ; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" - installFlags = "historydir=$(TMPDIR)/foo"; + installFlags = [ + "historydir=$(TMPDIR)/foo" + ]; - meta = { + meta = with stdenv.lib; { homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } |