summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-10-11 17:04:17 +0100
committerGitHub <noreply@github.com>2017-10-11 17:04:17 +0100
commit48f0389bf8bcf1cd7b71e6f90165553685afcfae (patch)
tree30be683abe263b673876eebd8371fae049caa562 /pkgs
parentfd84a79623082280b9d9bbaddd0e580fe42babf4 (diff)
parente1b74291bd218a0e943a7f13d4ae9dc7f36b2200 (diff)
downloadnixpkgs-48f0389bf8bcf1cd7b71e6f90165553685afcfae.tar
nixpkgs-48f0389bf8bcf1cd7b71e6f90165553685afcfae.tar.gz
nixpkgs-48f0389bf8bcf1cd7b71e6f90165553685afcfae.tar.bz2
nixpkgs-48f0389bf8bcf1cd7b71e6f90165553685afcfae.tar.lz
nixpkgs-48f0389bf8bcf1cd7b71e6f90165553685afcfae.tar.xz
nixpkgs-48f0389bf8bcf1cd7b71e6f90165553685afcfae.tar.zst
nixpkgs-48f0389bf8bcf1cd7b71e6f90165553685afcfae.zip
Merge pull request #30314 from ArdaXi/geoclue-fixes
geoclue2: 2.4.3 -> 2.4.7 and add wrapGAppsHook
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/geoclue/2.0.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 34da3c1f372..64d61d64bb6 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -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";