Merge pull request #30314 from ArdaXi/geoclue-fixes
geoclue2: 2.4.3 -> 2.4.7 and add wrapGAppsHook
This commit is contained in:
commit
48f0389bf8
@ -1,23 +1,23 @@
|
||||
{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip
|
||||
, dbus, dbus_glib, modemmanager, avahi
|
||||
, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geoclue-2.4.3";
|
||||
name = "geoclue-2.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
|
||||
sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd";
|
||||
sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
pkgconfig intltool wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = libintlOrEmpty ++
|
||||
[ intltool glib json_glib libsoup geoip
|
||||
[ glib json_glib libsoup geoip
|
||||
dbus dbus_glib avahi
|
||||
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
|
||||
|
||||
propagatedBuildInputs = [ dbus dbus_glib glib ];
|
||||
propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Geolocation framework and some data providers";
|
||||
|
Loading…
Reference in New Issue
Block a user