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

Merge pull request #30314 from ArdaXi/geoclue-fixes

Browse Source 
geoclue2: 2.4.3 -> 2.4.7 and add wrapGAppsHook
This commit is contained in:
Jörg Thalheim 2017-10-11 17:04:17 +01:00 committed by GitHub
commit 48f0389bf8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,23 @@
{ 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;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geoclue-2.4.3"; name = "geoclue-2.4.7";
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
}; };
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";