upower: 0.99.9 -> 0.99.10

Using placeholder and drop the NIX_CFLAGS_LINK.

https://gitlab.freedesktop.org/upower/upower/blob/UPOWER_0_99_10/NEWS
This commit is contained in:
worldofpeace 2019-05-08 23:06:00 -04:00
parent 78dbfdc6a9
commit b39324bf52

View File

@ -1,41 +1,64 @@
{ stdenv, fetchurl, pkgconfig, dbus-glib { stdenv
, intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 , fetchurl
, useSystemd ? true, systemd, gobject-introspection , pkgconfig
, dbus-glib
, intltool
, libxslt
, docbook_xsl
, udev
, libgudev
, libusb1
, gobject-introspection
, useSystemd ? true, systemd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "upower-0.99.9"; pname = "upower";
version = "0.99.10";
src = fetchurl { src = fetchurl {
url = https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz; url = https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz;
sha256 = "046ix7j7hmb7ycv8v54668kjsrgjhzwxn299c1d87vdnkd38kfh1"; sha256 = "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4";
}; };
buildInputs = nativeBuildInputs = [
[ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobject-introspection ] pkgconfig
++ stdenv.lib.optional useSystemd systemd; ];
nativeBuildInputs = [ pkgconfig ]; buildInputs = [
dbus-glib
intltool
libxslt
docbook_xsl
udev
libgudev
libusb1
gobject-introspection
]
++ stdenv.lib.optional useSystemd systemd
;
configureFlags = configureFlags = [
[ "--with-backend=linux" "--localstatedir=/var" "--with-backend=linux"
] "--localstatedir=/var"
++ stdenv.lib.optional useSystemd ]
[ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ++ stdenv.lib.optional useSystemd [
"--with-systemdutildir=$(out)/lib/systemd" "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
"--with-udevrulesdir=$(out)/lib/udev/rules.d" "--with-systemdutildir=${placeholder ''out''}/lib/systemd"
]; "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d"
]
NIX_CFLAGS_LINK = "-lgcc_s"; ;
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" 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/; homepage = https://upower.freedesktop.org/;
description = "A D-Bus service for power management"; description = "A D-Bus service for power management";
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
}; };
} }