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

Merge pull request #48438 from worldofpeace/geoclue2/2.5.0 

geoclue2: 2.4.12 -> 2.5.1
This commit is contained in:
worldofpeace 2018-11-30 18:07:53 -05:00 committed by GitHub
parent 274e72aa29 607aefd972
commit 7131b7f260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/development/libraries/geoclue/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobjectIntrospection, vala
, withDemoAgent ? false , withDemoAgent ? false
}: }:
@ -7,17 +7,20 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geoclue-${version}"; name = "geoclue-${version}";
version = "2.4.12"; version = "2.5.1";
src = fetchurl { src = fetchFromGitLab {
url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; domain = "gitlab.freedesktop.org";
sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05"; owner = "geoclue";
repo = "geoclue";
rev = version;
sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig intltool wrapGAppsHook gobjectIntrospection pkgconfig meson ninja wrapGAppsHook python3 vala gobjectIntrospection
# devdoc # devdoc
gtk-doc docbook_xsl docbook_xml_dtd_412 gtk-doc docbook_xsl docbook_xml_dtd_412
]; ];
@ -30,26 +33,20 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib glib-networking ]; propagatedBuildInputs = [ glib glib-networking ];
# Whitelist elementary's agent mesonFlags = [
patches = [ "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
(fetchpatch { "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2b0491e408be1ebcdbe8751bb2637c1acb78f71e.patch"; ] ++ optionals stdenv.isDarwin [
sha256 = "0pac94y55iksk340dlx3gkhb9lrci90mxqqy5fnh1zbjw9bqxfn4"; "-D3g-source=false"
}) "-Dcdma-source=false"
"-Dmodem-gps-source=false"
"-Dnmea-source=false"
]; ];
configureFlags = [ postPatch = ''
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" chmod +x demo/install-file.py
"--enable-introspection" patchShebangs demo/install-file.py
"--enable-gtk-doc" '';
"--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
] ++ optionals stdenv.isDarwin [
"--disable-silent-rules"
"--disable-3g-source"
"--disable-cdma-source"
"--disable-modem-gps-source"
"--disable-nmea-source"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Geolocation framework and some data providers"; description = "Geolocation framework and some data providers";