From 4f6ce0d07780f05bd17c34c726565a804804362a Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Wed, 11 Oct 2017 13:51:12 +0200 Subject: [PATCH 1/2] geoclue2: 2.4.3 -> 2.4.7 --- pkgs/development/libraries/geoclue/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 34da3c1f372..b6e74a49cec 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -5,11 +5,11 @@ 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 = [ From e1b74291bd218a0e943a7f13d4ae9dc7f36b2200 Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Wed, 11 Oct 2017 13:51:31 +0200 Subject: [PATCH 2/2] 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. --- pkgs/development/libraries/geoclue/2.0.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index b6e74a49cec..64d61d64bb6 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -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";