JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

geoclue2: Add glib_networking and wrapGAppsHook

Browse Source 
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:
Arda Xi 2017-10-11 13:51:31 +02:00
parent 4f6ce0d077
commit e1b74291bd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/geoclue/2.0.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip { 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; with stdenv.lib;
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig intltool wrapGAppsHook
]; ];
buildInputs = libintlOrEmpty ++ buildInputs = libintlOrEmpty ++
[ intltool glib json_glib libsoup geoip [ glib json_glib libsoup geoip
dbus dbus_glib avahi dbus dbus_glib avahi
] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
propagatedBuildInputs = [ dbus dbus_glib glib ]; propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Geolocation framework and some data providers"; description = "Geolocation framework and some data providers";