geoclue2: Add glib_networking and wrapGAppsHook
geoclue2 without GNOME requires glib_networking in order to make HTTPS connections to location providers. Additionally, geoclue2 crashes if an NMEA provider is found on the network without GSettings support. Also moved intltool to nativeBuildInputs as per good practices.
This commit is contained in:
parent
4f6ce0d077
commit
e1b74291bd
@ -1,5 +1,5 @@
|
||||
{ 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;
|
||||
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
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